From 3389a86abc27cf2a972a60d93d4ded194faaab04 Mon Sep 17 00:00:00 2001
From: Cyril Rohr <cyril.rohr@irisa.fr>
Date: Mon, 31 Jan 2011 10:08:17 +0100
Subject: [PATCH] 
 [bordeaux,grenoble,lille,lyon,nancy,orsay,rennes,sophia,toulouse] Maintenance
 operation to revert JSON files back to lexicographically sorted keys.

---
 .../environments/etch-x64-base-1.0.json       |  42 ++---
 .../environments/etch-x64-base-1.1.json       |  42 ++---
 .../environments/etch-x64-base-2.0.json       |  42 ++---
 .../environments/etch-x64-big-1.0.json        |  34 ++--
 .../environments/etch-x64-big-1.1.json        |  34 ++--
 .../environments/etch-x64-big-2.0.json        |  34 ++--
 .../environments/etch-x64-nfs-1.0.json        |  34 ++--
 .../environments/etch-x64-nfs-1.1.json        |  34 ++--
 .../environments/etch-x64-nfs-2.0.json        |  34 ++--
 .../environments/etch-x64-xen-1.0.json        |  34 ++--
 .../environments/lenny-x64-base-0.9.json      |  42 ++---
 .../environments/lenny-x64-base-1.0.json      |  42 ++---
 .../environments/lenny-x64-base-2.0.json      |  42 ++---
 .../environments/lenny-x64-base-2.1.json      |  42 ++---
 .../environments/lenny-x64-base-2.2.json      |  42 ++---
 .../environments/lenny-x64-base-2.3.json      |  42 ++---
 .../environments/lenny-x64-big-0.9.json       |  34 ++--
 .../environments/lenny-x64-big-1.0.json       |  34 ++--
 .../environments/lenny-x64-big-2.0.json       |  34 ++--
 .../environments/lenny-x64-big-2.1.json       |  34 ++--
 .../environments/lenny-x64-big-2.2.json       |  34 ++--
 .../environments/lenny-x64-nfs-0.9.json       |  34 ++--
 .../environments/lenny-x64-nfs-1.0.json       |  34 ++--
 .../environments/lenny-x64-nfs-2.0.json       |  34 ++--
 .../environments/lenny-x64-nfs-2.1.json       |  34 ++--
 .../environments/lenny-x64-nfs-2.2.json       |  34 ++--
 .../environments/lenny-x64-xen-1.0.json       |  34 ++--
 .../environments/sid-x64-base-1.0.json        |  42 ++---
 .../environments/sid-x64-base-1.1.json        |  42 ++---
 .../environments/sid-x64-big-1.1.json         |  34 ++--
 .../environments/sid-x64-nfs-1.0.json         |  34 ++--
 .../environments/sid-x64-nfs-1.1.json         |  34 ++--
 data/grid5000/sites/bordeaux/bordeaux.json    |  18 +--
 .../clusters/bordeplage/bordeplage.json       |   8 +-
 .../bordeplage/nodes/bordeplage-1.json        | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-10.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-11.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-12.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-13.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-14.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-15.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-16.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-17.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-18.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-19.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-2.json        | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-20.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-21.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-22.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-23.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-24.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-25.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-26.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-27.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-28.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-29.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-3.json        | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-30.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-31.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-32.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-33.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-34.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-35.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-36.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-37.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-38.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-39.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-4.json        | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-40.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-41.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-42.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-43.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-44.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-45.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-46.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-47.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-48.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-49.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-5.json        | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-50.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-51.json       | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-6.json        | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-7.json        | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-8.json        | 108 ++++++-------
 .../bordeplage/nodes/bordeplage-9.json        | 108 ++++++-------
 .../clusters/bordereau/bordereau.json         |   8 +-
 .../clusters/bordereau/nodes/bordereau-1.json |  98 ++++++------
 .../bordereau/nodes/bordereau-10.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-11.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-12.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-13.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-14.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-15.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-16.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-17.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-18.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-19.json         |  98 ++++++------
 .../clusters/bordereau/nodes/bordereau-2.json |  98 ++++++------
 .../bordereau/nodes/bordereau-20.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-21.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-22.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-23.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-24.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-25.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-26.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-27.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-28.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-29.json         |  98 ++++++------
 .../clusters/bordereau/nodes/bordereau-3.json |  98 ++++++------
 .../bordereau/nodes/bordereau-30.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-31.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-32.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-33.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-34.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-35.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-36.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-37.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-38.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-39.json         |  98 ++++++------
 .../clusters/bordereau/nodes/bordereau-4.json |  98 ++++++------
 .../bordereau/nodes/bordereau-40.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-41.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-42.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-43.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-44.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-45.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-46.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-47.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-48.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-49.json         |  98 ++++++------
 .../clusters/bordereau/nodes/bordereau-5.json |  98 ++++++------
 .../bordereau/nodes/bordereau-50.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-51.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-52.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-53.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-54.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-55.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-56.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-57.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-58.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-59.json         |  98 ++++++------
 .../clusters/bordereau/nodes/bordereau-6.json |  98 ++++++------
 .../bordereau/nodes/bordereau-60.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-61.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-62.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-63.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-64.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-65.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-66.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-67.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-68.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-69.json         |  98 ++++++------
 .../clusters/bordereau/nodes/bordereau-7.json |  98 ++++++------
 .../bordereau/nodes/bordereau-70.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-71.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-72.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-73.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-74.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-75.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-76.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-77.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-78.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-79.json         |  98 ++++++------
 .../clusters/bordereau/nodes/bordereau-8.json |  98 ++++++------
 .../bordereau/nodes/bordereau-80.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-81.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-82.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-83.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-84.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-85.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-86.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-87.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-88.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-89.json         |  98 ++++++------
 .../clusters/bordereau/nodes/bordereau-9.json |  98 ++++++------
 .../bordereau/nodes/bordereau-90.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-91.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-92.json         |  98 ++++++------
 .../bordereau/nodes/bordereau-93.json         |  98 ++++++------
 .../clusters/borderline/borderline.json       |   8 +-
 .../borderline/nodes/borderline-1.json        | 118 +++++++-------
 .../borderline/nodes/borderline-10.json       | 118 +++++++-------
 .../borderline/nodes/borderline-2.json        | 118 +++++++-------
 .../borderline/nodes/borderline-3.json        | 118 +++++++-------
 .../borderline/nodes/borderline-4.json        | 118 +++++++-------
 .../borderline/nodes/borderline-5.json        | 118 +++++++-------
 .../borderline/nodes/borderline-6.json        | 118 +++++++-------
 .../borderline/nodes/borderline-7.json        | 118 +++++++-------
 .../borderline/nodes/borderline-8.json        | 118 +++++++-------
 .../borderline/nodes/borderline-9.json        | 118 +++++++-------
 .../grenoble/clusters/adonis/adonis.json      |   6 +-
 .../clusters/adonis/nodes/adonis-1.json       |  84 +++++-----
 .../clusters/adonis/nodes/adonis-10.json      |  84 +++++-----
 .../clusters/adonis/nodes/adonis-11.json      |  72 ++++-----
 .../clusters/adonis/nodes/adonis-12.json      |  72 ++++-----
 .../clusters/adonis/nodes/adonis-2.json       |  84 +++++-----
 .../clusters/adonis/nodes/adonis-3.json       |  84 +++++-----
 .../clusters/adonis/nodes/adonis-4.json       |  84 +++++-----
 .../clusters/adonis/nodes/adonis-5.json       |  84 +++++-----
 .../clusters/adonis/nodes/adonis-6.json       |  84 +++++-----
 .../clusters/adonis/nodes/adonis-7.json       |  84 +++++-----
 .../clusters/adonis/nodes/adonis-8.json       |  84 +++++-----
 .../clusters/adonis/nodes/adonis-9.json       |  84 +++++-----
 .../sites/grenoble/clusters/edel/edel.json    |   6 +-
 .../grenoble/clusters/edel/nodes/edel-1.json  |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-10.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-11.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-12.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-13.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-14.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-15.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-16.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-17.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-18.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-19.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-2.json  |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-20.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-21.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-22.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-23.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-24.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-25.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-26.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-27.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-28.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-29.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-3.json  |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-30.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-31.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-32.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-33.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-34.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-35.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-36.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-37.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-38.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-39.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-4.json  |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-40.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-41.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-42.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-43.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-44.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-45.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-46.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-47.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-48.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-49.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-5.json  |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-50.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-51.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-52.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-53.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-54.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-55.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-56.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-57.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-58.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-59.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-6.json  |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-60.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-61.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-62.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-63.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-64.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-65.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-66.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-67.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-68.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-69.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-7.json  |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-70.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-71.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-72.json |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-8.json  |  80 +++++-----
 .../grenoble/clusters/edel/nodes/edel-9.json  |  80 +++++-----
 .../grenoble/clusters/genepi/genepi.json      |   6 +-
 .../clusters/genepi/nodes/genepi-1.json       |  80 +++++-----
 .../clusters/genepi/nodes/genepi-10.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-11.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-12.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-13.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-14.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-15.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-16.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-17.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-18.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-19.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-2.json       |  80 +++++-----
 .../clusters/genepi/nodes/genepi-20.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-21.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-22.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-23.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-24.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-25.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-26.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-27.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-28.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-29.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-3.json       |  80 +++++-----
 .../clusters/genepi/nodes/genepi-30.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-31.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-32.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-33.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-34.json      |  80 +++++-----
 .../clusters/genepi/nodes/genepi-4.json       |  80 +++++-----
 .../clusters/genepi/nodes/genepi-5.json       |  80 +++++-----
 .../clusters/genepi/nodes/genepi-6.json       |  80 +++++-----
 .../clusters/genepi/nodes/genepi-7.json       |  80 +++++-----
 .../clusters/genepi/nodes/genepi-8.json       |  80 +++++-----
 .../clusters/genepi/nodes/genepi-9.json       |  80 +++++-----
 data/grid5000/sites/grenoble/grenoble.json    |  14 +-
 .../lille/clusters/chicon/nodes/chicon-1.json |   2 +-
 .../clusters/chicon/nodes/chicon-10.json      |   2 +-
 .../clusters/chicon/nodes/chicon-11.json      |   2 +-
 .../clusters/chicon/nodes/chicon-12.json      |   2 +-
 .../clusters/chicon/nodes/chicon-13.json      |   2 +-
 .../clusters/chicon/nodes/chicon-14.json      |   2 +-
 .../clusters/chicon/nodes/chicon-15.json      |   2 +-
 .../clusters/chicon/nodes/chicon-16.json      |   2 +-
 .../clusters/chicon/nodes/chicon-17.json      |   2 +-
 .../clusters/chicon/nodes/chicon-18.json      |   2 +-
 .../clusters/chicon/nodes/chicon-19.json      |   2 +-
 .../lille/clusters/chicon/nodes/chicon-2.json |   2 +-
 .../clusters/chicon/nodes/chicon-20.json      |   2 +-
 .../clusters/chicon/nodes/chicon-21.json      |   2 +-
 .../clusters/chicon/nodes/chicon-22.json      |   2 +-
 .../clusters/chicon/nodes/chicon-23.json      |   2 +-
 .../clusters/chicon/nodes/chicon-24.json      |   2 +-
 .../clusters/chicon/nodes/chicon-25.json      |   2 +-
 .../clusters/chicon/nodes/chicon-26.json      |   2 +-
 .../lille/clusters/chicon/nodes/chicon-3.json |   2 +-
 .../lille/clusters/chicon/nodes/chicon-4.json |   2 +-
 .../lille/clusters/chicon/nodes/chicon-5.json |   2 +-
 .../lille/clusters/chicon/nodes/chicon-6.json |   2 +-
 .../lille/clusters/chicon/nodes/chicon-7.json |   2 +-
 .../lille/clusters/chicon/nodes/chicon-8.json |   2 +-
 .../lille/clusters/chicon/nodes/chicon-9.json |   2 +-
 .../chinqchint/nodes/chinqchint-1.json        |   2 +-
 .../chinqchint/nodes/chinqchint-10.json       |   2 +-
 .../chinqchint/nodes/chinqchint-11.json       |   2 +-
 .../chinqchint/nodes/chinqchint-12.json       |   2 +-
 .../chinqchint/nodes/chinqchint-13.json       |   2 +-
 .../chinqchint/nodes/chinqchint-15.json       |   2 +-
 .../chinqchint/nodes/chinqchint-16.json       |   2 +-
 .../chinqchint/nodes/chinqchint-17.json       |   2 +-
 .../chinqchint/nodes/chinqchint-18.json       |   2 +-
 .../chinqchint/nodes/chinqchint-19.json       |   2 +-
 .../chinqchint/nodes/chinqchint-2.json        |   2 +-
 .../chinqchint/nodes/chinqchint-20.json       |   2 +-
 .../chinqchint/nodes/chinqchint-21.json       |   2 +-
 .../chinqchint/nodes/chinqchint-22.json       |   2 +-
 .../chinqchint/nodes/chinqchint-23.json       |   2 +-
 .../chinqchint/nodes/chinqchint-24.json       |   2 +-
 .../chinqchint/nodes/chinqchint-25.json       |   2 +-
 .../chinqchint/nodes/chinqchint-26.json       |   2 +-
 .../chinqchint/nodes/chinqchint-27.json       |   2 +-
 .../chinqchint/nodes/chinqchint-28.json       |   2 +-
 .../chinqchint/nodes/chinqchint-29.json       |   2 +-
 .../chinqchint/nodes/chinqchint-3.json        |   2 +-
 .../chinqchint/nodes/chinqchint-30.json       |   2 +-
 .../chinqchint/nodes/chinqchint-31.json       |   2 +-
 .../chinqchint/nodes/chinqchint-32.json       |   2 +-
 .../chinqchint/nodes/chinqchint-33.json       |   2 +-
 .../chinqchint/nodes/chinqchint-34.json       |   2 +-
 .../chinqchint/nodes/chinqchint-35.json       |   2 +-
 .../chinqchint/nodes/chinqchint-36.json       |   2 +-
 .../chinqchint/nodes/chinqchint-37.json       |   2 +-
 .../chinqchint/nodes/chinqchint-38.json       |   2 +-
 .../chinqchint/nodes/chinqchint-39.json       |   2 +-
 .../chinqchint/nodes/chinqchint-4.json        |   2 +-
 .../chinqchint/nodes/chinqchint-40.json       |   2 +-
 .../chinqchint/nodes/chinqchint-41.json       |   2 +-
 .../chinqchint/nodes/chinqchint-42.json       |   2 +-
 .../chinqchint/nodes/chinqchint-43.json       |   2 +-
 .../chinqchint/nodes/chinqchint-44.json       |   2 +-
 .../chinqchint/nodes/chinqchint-45.json       |   2 +-
 .../chinqchint/nodes/chinqchint-46.json       |   2 +-
 .../chinqchint/nodes/chinqchint-5.json        |   2 +-
 .../chinqchint/nodes/chinqchint-6.json        |   2 +-
 .../chinqchint/nodes/chinqchint-7.json        |   2 +-
 .../chinqchint/nodes/chinqchint-8.json        |   2 +-
 .../chinqchint/nodes/chinqchint-9.json        |   2 +-
 .../lille/clusters/chti/nodes/chti-1.json     |   2 +-
 .../lille/clusters/chti/nodes/chti-10.json    |   2 +-
 .../lille/clusters/chti/nodes/chti-11.json    |   2 +-
 .../lille/clusters/chti/nodes/chti-12.json    |   2 +-
 .../lille/clusters/chti/nodes/chti-13.json    |   2 +-
 .../lille/clusters/chti/nodes/chti-14.json    |   2 +-
 .../lille/clusters/chti/nodes/chti-15.json    |   2 +-
 .../lille/clusters/chti/nodes/chti-16.json    |   2 +-
 .../lille/clusters/chti/nodes/chti-17.json    |   2 +-
 .../lille/clusters/chti/nodes/chti-18.json    |   2 +-
 .../lille/clusters/chti/nodes/chti-19.json    |   2 +-
 .../lille/clusters/chti/nodes/chti-2.json     |   2 +-
 .../lille/clusters/chti/nodes/chti-20.json    |   2 +-
 .../lille/clusters/chti/nodes/chti-3.json     |   2 +-
 .../lille/clusters/chti/nodes/chti-4.json     |   2 +-
 .../lille/clusters/chti/nodes/chti-5.json     |   2 +-
 .../lille/clusters/chti/nodes/chti-6.json     |   2 +-
 .../lille/clusters/chti/nodes/chti-7.json     |   2 +-
 .../lille/clusters/chti/nodes/chti-8.json     |   2 +-
 .../lille/clusters/chti/nodes/chti-9.json     |   2 +-
 .../environments/lenny-x64-base-2.3.json      |   1 +
 .../lyon/clusters/capricorne/capricorne.json  |   6 +-
 .../capricorne/nodes/capricorne-1.json        | 102 ++++++------
 .../capricorne/nodes/capricorne-10.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-11.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-12.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-13.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-14.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-15.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-16.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-17.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-18.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-19.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-2.json        | 102 ++++++------
 .../capricorne/nodes/capricorne-20.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-21.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-22.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-23.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-24.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-25.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-26.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-27.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-28.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-29.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-3.json        | 102 ++++++------
 .../capricorne/nodes/capricorne-30.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-31.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-32.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-33.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-34.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-35.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-36.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-37.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-38.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-39.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-4.json        | 102 ++++++------
 .../capricorne/nodes/capricorne-40.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-41.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-42.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-43.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-44.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-45.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-46.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-47.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-48.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-49.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-5.json        | 102 ++++++------
 .../capricorne/nodes/capricorne-50.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-51.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-52.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-53.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-54.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-55.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-56.json       | 102 ++++++------
 .../capricorne/nodes/capricorne-6.json        | 102 ++++++------
 .../capricorne/nodes/capricorne-7.json        | 102 ++++++------
 .../capricorne/nodes/capricorne-8.json        | 102 ++++++------
 .../capricorne/nodes/capricorne-9.json        | 102 ++++++------
 .../sagittaire/nodes/sagittaire-1.json        |  88 +++++-----
 .../sagittaire/nodes/sagittaire-10.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-11.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-12.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-13.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-14.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-15.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-16.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-17.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-18.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-19.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-2.json        |  88 +++++-----
 .../sagittaire/nodes/sagittaire-20.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-21.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-22.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-23.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-24.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-25.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-26.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-27.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-28.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-29.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-3.json        |  88 +++++-----
 .../sagittaire/nodes/sagittaire-30.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-31.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-32.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-33.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-34.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-35.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-36.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-37.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-38.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-39.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-4.json        |  88 +++++-----
 .../sagittaire/nodes/sagittaire-40.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-41.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-42.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-43.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-44.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-45.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-46.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-47.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-48.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-49.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-5.json        |  88 +++++-----
 .../sagittaire/nodes/sagittaire-50.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-51.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-52.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-53.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-54.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-55.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-56.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-57.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-58.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-59.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-6.json        |  88 +++++-----
 .../sagittaire/nodes/sagittaire-60.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-61.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-62.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-63.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-64.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-65.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-66.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-67.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-68.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-69.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-7.json        |  88 +++++-----
 .../sagittaire/nodes/sagittaire-70.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-71.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-72.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-73.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-74.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-75.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-76.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-77.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-78.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-79.json       |  88 +++++-----
 .../sagittaire/nodes/sagittaire-8.json        |  88 +++++-----
 .../sagittaire/nodes/sagittaire-9.json        |  88 +++++-----
 .../lyon/clusters/sagittaire/sagittaire.json  |   6 +-
 data/grid5000/sites/lyon/lyon.json            |  14 +-
 .../sites/orsay/clusters/gdx/gdx.json         |   6 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-1.json | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-10.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-100.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-101.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-102.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-103.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-104.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-105.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-106.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-107.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-108.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-109.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-11.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-110.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-111.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-112.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-113.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-114.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-115.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-116.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-117.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-118.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-119.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-12.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-120.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-121.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-122.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-123.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-124.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-125.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-126.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-127.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-128.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-129.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-13.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-130.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-131.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-132.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-133.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-134.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-135.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-136.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-137.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-138.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-139.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-14.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-140.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-141.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-142.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-143.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-144.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-145.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-146.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-147.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-148.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-149.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-15.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-150.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-151.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-152.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-153.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-154.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-155.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-156.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-157.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-158.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-159.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-16.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-160.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-161.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-162.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-163.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-164.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-165.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-166.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-167.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-168.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-169.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-17.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-170.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-171.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-172.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-173.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-174.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-175.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-176.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-177.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-178.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-179.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-18.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-180.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-181.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-182.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-183.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-184.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-185.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-186.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-187.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-188.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-189.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-19.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-190.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-191.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-192.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-193.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-194.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-195.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-196.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-197.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-198.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-199.json     | 110 ++++++-------
 .../sites/orsay/clusters/gdx/nodes/gdx-2.json | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-20.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-200.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-201.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-202.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-203.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-204.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-205.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-206.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-207.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-208.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-209.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-21.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-210.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-211.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-212.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-213.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-214.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-215.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-216.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-217.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-218.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-219.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-22.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-220.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-221.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-222.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-223.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-224.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-225.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-226.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-227.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-228.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-229.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-23.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-230.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-231.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-232.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-233.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-234.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-235.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-236.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-237.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-238.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-239.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-24.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-240.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-241.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-242.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-243.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-244.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-245.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-246.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-247.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-248.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-249.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-25.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-250.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-251.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-252.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-253.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-254.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-255.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-256.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-257.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-258.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-259.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-26.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-260.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-261.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-262.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-263.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-264.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-265.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-266.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-267.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-268.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-269.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-27.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-270.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-271.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-272.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-273.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-274.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-275.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-276.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-277.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-278.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-279.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-28.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-280.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-281.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-282.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-283.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-284.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-285.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-286.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-287.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-288.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-289.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-29.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-290.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-291.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-292.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-293.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-294.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-295.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-296.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-297.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-298.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-299.json     | 110 ++++++-------
 .../sites/orsay/clusters/gdx/nodes/gdx-3.json | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-30.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-300.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-301.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-302.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-303.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-304.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-305.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-306.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-307.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-308.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-309.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-31.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-310.json     | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-32.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-33.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-34.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-35.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-36.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-37.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-38.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-39.json      | 110 ++++++-------
 .../sites/orsay/clusters/gdx/nodes/gdx-4.json | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-40.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-41.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-42.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-43.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-44.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-45.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-46.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-47.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-48.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-49.json      | 110 ++++++-------
 .../sites/orsay/clusters/gdx/nodes/gdx-5.json | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-50.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-51.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-52.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-53.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-54.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-55.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-56.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-57.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-58.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-59.json      | 110 ++++++-------
 .../sites/orsay/clusters/gdx/nodes/gdx-6.json | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-60.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-61.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-62.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-63.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-64.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-65.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-66.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-67.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-68.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-69.json      | 110 ++++++-------
 .../sites/orsay/clusters/gdx/nodes/gdx-7.json | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-70.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-71.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-72.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-73.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-74.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-75.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-76.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-77.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-78.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-79.json      | 110 ++++++-------
 .../sites/orsay/clusters/gdx/nodes/gdx-8.json | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-80.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-81.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-82.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-83.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-84.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-85.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-86.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-87.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-88.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-89.json      | 110 ++++++-------
 .../sites/orsay/clusters/gdx/nodes/gdx-9.json | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-90.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-91.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-92.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-93.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-94.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-95.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-96.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-97.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-98.json      | 110 ++++++-------
 .../orsay/clusters/gdx/nodes/gdx-99.json      | 110 ++++++-------
 .../sites/orsay/clusters/netgdx/netgdx.json   |   6 +-
 .../orsay/clusters/netgdx/nodes/netgdx-1.json | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-10.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-11.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-12.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-13.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-14.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-15.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-16.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-17.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-18.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-19.json      | 110 ++++++-------
 .../orsay/clusters/netgdx/nodes/netgdx-2.json | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-20.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-21.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-22.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-23.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-24.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-25.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-26.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-27.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-28.json      | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-29.json      | 110 ++++++-------
 .../orsay/clusters/netgdx/nodes/netgdx-3.json | 110 ++++++-------
 .../clusters/netgdx/nodes/netgdx-30.json      | 110 ++++++-------
 .../orsay/clusters/netgdx/nodes/netgdx-4.json | 110 ++++++-------
 .../orsay/clusters/netgdx/nodes/netgdx-5.json | 110 ++++++-------
 .../orsay/clusters/netgdx/nodes/netgdx-6.json | 110 ++++++-------
 .../orsay/clusters/netgdx/nodes/netgdx-7.json | 110 ++++++-------
 .../orsay/clusters/netgdx/nodes/netgdx-8.json | 110 ++++++-------
 .../orsay/clusters/netgdx/nodes/netgdx-9.json | 110 ++++++-------
 data/grid5000/sites/orsay/orsay.json          |  14 +-
 .../clusters/paradent/nodes/paradent-1.json   |  80 +++++-----
 .../clusters/paradent/nodes/paradent-10.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-11.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-12.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-13.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-14.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-15.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-16.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-17.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-18.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-19.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-2.json   |  80 +++++-----
 .../clusters/paradent/nodes/paradent-20.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-21.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-22.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-23.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-24.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-25.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-26.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-27.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-28.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-29.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-3.json   |  80 +++++-----
 .../clusters/paradent/nodes/paradent-30.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-31.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-32.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-33.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-34.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-35.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-36.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-37.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-38.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-39.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-4.json   |  80 +++++-----
 .../clusters/paradent/nodes/paradent-40.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-41.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-42.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-43.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-44.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-45.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-46.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-47.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-48.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-49.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-5.json   |  80 +++++-----
 .../clusters/paradent/nodes/paradent-50.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-51.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-52.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-53.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-54.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-55.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-56.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-57.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-58.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-59.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-6.json   |  80 +++++-----
 .../clusters/paradent/nodes/paradent-60.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-61.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-62.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-63.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-64.json  |  80 +++++-----
 .../clusters/paradent/nodes/paradent-7.json   |  80 +++++-----
 .../clusters/paradent/nodes/paradent-8.json   |  80 +++++-----
 .../clusters/paradent/nodes/paradent-9.json   |  80 +++++-----
 .../rennes/clusters/paradent/paradent.json    |   6 +-
 .../clusters/paramount/nodes/paramount-1.json | 104 ++++++------
 .../paramount/nodes/paramount-10.json         | 104 ++++++------
 .../paramount/nodes/paramount-11.json         | 104 ++++++------
 .../paramount/nodes/paramount-12.json         | 104 ++++++------
 .../paramount/nodes/paramount-13.json         | 104 ++++++------
 .../paramount/nodes/paramount-14.json         | 104 ++++++------
 .../paramount/nodes/paramount-15.json         | 104 ++++++------
 .../paramount/nodes/paramount-16.json         | 104 ++++++------
 .../paramount/nodes/paramount-17.json         | 104 ++++++------
 .../paramount/nodes/paramount-18.json         | 104 ++++++------
 .../paramount/nodes/paramount-19.json         | 104 ++++++------
 .../clusters/paramount/nodes/paramount-2.json | 104 ++++++------
 .../paramount/nodes/paramount-20.json         | 104 ++++++------
 .../paramount/nodes/paramount-21.json         | 104 ++++++------
 .../paramount/nodes/paramount-22.json         | 104 ++++++------
 .../paramount/nodes/paramount-23.json         | 104 ++++++------
 .../paramount/nodes/paramount-24.json         | 104 ++++++------
 .../paramount/nodes/paramount-25.json         | 104 ++++++------
 .../paramount/nodes/paramount-26.json         | 104 ++++++------
 .../paramount/nodes/paramount-27.json         | 104 ++++++------
 .../paramount/nodes/paramount-28.json         | 104 ++++++------
 .../paramount/nodes/paramount-29.json         | 104 ++++++------
 .../clusters/paramount/nodes/paramount-3.json | 104 ++++++------
 .../paramount/nodes/paramount-30.json         | 104 ++++++------
 .../paramount/nodes/paramount-31.json         | 104 ++++++------
 .../paramount/nodes/paramount-32.json         | 104 ++++++------
 .../paramount/nodes/paramount-33.json         | 104 ++++++------
 .../clusters/paramount/nodes/paramount-4.json | 104 ++++++------
 .../clusters/paramount/nodes/paramount-5.json | 104 ++++++------
 .../clusters/paramount/nodes/paramount-6.json | 104 ++++++------
 .../clusters/paramount/nodes/paramount-7.json | 104 ++++++------
 .../clusters/paramount/nodes/paramount-8.json | 104 ++++++------
 .../clusters/paramount/nodes/paramount-9.json | 104 ++++++------
 .../rennes/clusters/paramount/paramount.json  |   6 +-
 .../clusters/parapide/nodes/parapide-1.json   |  96 +++++------
 .../clusters/parapide/nodes/parapide-10.json  |  96 +++++------
 .../clusters/parapide/nodes/parapide-11.json  |  96 +++++------
 .../clusters/parapide/nodes/parapide-12.json  |  96 +++++------
 .../clusters/parapide/nodes/parapide-13.json  |  96 +++++------
 .../clusters/parapide/nodes/parapide-14.json  |  96 +++++------
 .../clusters/parapide/nodes/parapide-15.json  |  96 +++++------
 .../clusters/parapide/nodes/parapide-16.json  |  96 +++++------
 .../clusters/parapide/nodes/parapide-17.json  |  96 +++++------
 .../clusters/parapide/nodes/parapide-18.json  |  96 +++++------
 .../clusters/parapide/nodes/parapide-19.json  |  96 +++++------
 .../clusters/parapide/nodes/parapide-2.json   |  96 +++++------
 .../clusters/parapide/nodes/parapide-20.json  |  96 +++++------
 .../clusters/parapide/nodes/parapide-21.json  |  96 +++++------
 .../clusters/parapide/nodes/parapide-22.json  |  96 +++++------
 .../clusters/parapide/nodes/parapide-23.json  |  96 +++++------
 .../clusters/parapide/nodes/parapide-24.json  |  96 +++++------
 .../clusters/parapide/nodes/parapide-25.json  |  96 +++++------
 .../clusters/parapide/nodes/parapide-3.json   |  96 +++++------
 .../clusters/parapide/nodes/parapide-4.json   |  96 +++++------
 .../clusters/parapide/nodes/parapide-5.json   |  96 +++++------
 .../clusters/parapide/nodes/parapide-6.json   |  96 +++++------
 .../clusters/parapide/nodes/parapide-7.json   |  96 +++++------
 .../clusters/parapide/nodes/parapide-8.json   |  96 +++++------
 .../clusters/parapide/nodes/parapide-9.json   |  96 +++++------
 .../rennes/clusters/parapide/parapide.json    |   6 +-
 .../clusters/parapluie/nodes/parapluie-1.json | 150 +++++++++---------
 .../parapluie/nodes/parapluie-10.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-11.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-12.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-13.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-14.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-15.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-16.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-17.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-18.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-19.json         | 150 +++++++++---------
 .../clusters/parapluie/nodes/parapluie-2.json | 150 +++++++++---------
 .../parapluie/nodes/parapluie-20.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-21.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-22.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-23.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-24.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-25.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-26.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-27.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-28.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-29.json         | 150 +++++++++---------
 .../clusters/parapluie/nodes/parapluie-3.json | 150 +++++++++---------
 .../parapluie/nodes/parapluie-30.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-31.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-32.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-33.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-34.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-35.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-36.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-37.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-38.json         | 150 +++++++++---------
 .../parapluie/nodes/parapluie-39.json         | 150 +++++++++---------
 .../clusters/parapluie/nodes/parapluie-4.json | 150 +++++++++---------
 .../parapluie/nodes/parapluie-40.json         | 150 +++++++++---------
 .../clusters/parapluie/nodes/parapluie-5.json | 150 +++++++++---------
 .../clusters/parapluie/nodes/parapluie-6.json | 150 +++++++++---------
 .../clusters/parapluie/nodes/parapluie-7.json | 150 +++++++++---------
 .../clusters/parapluie/nodes/parapluie-8.json | 150 +++++++++---------
 .../clusters/parapluie/nodes/parapluie-9.json | 150 +++++++++---------
 .../rennes/clusters/parapluie/parapluie.json  |   6 +-
 data/grid5000/sites/rennes/rennes.json        |  16 +-
 .../sites/sophia/clusters/helios/helios.json  |   6 +-
 .../clusters/helios/nodes/helios-1.json       | 134 ++++++++--------
 .../clusters/helios/nodes/helios-10.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-11.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-12.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-13.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-14.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-15.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-16.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-17.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-18.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-19.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-2.json       | 134 ++++++++--------
 .../clusters/helios/nodes/helios-20.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-21.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-22.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-23.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-24.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-25.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-26.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-27.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-28.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-29.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-3.json       | 134 ++++++++--------
 .../clusters/helios/nodes/helios-30.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-31.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-32.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-33.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-34.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-35.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-36.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-37.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-38.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-39.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-4.json       | 134 ++++++++--------
 .../clusters/helios/nodes/helios-40.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-41.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-42.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-43.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-44.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-45.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-46.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-47.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-48.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-49.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-5.json       | 134 ++++++++--------
 .../clusters/helios/nodes/helios-50.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-51.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-52.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-53.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-54.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-55.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-56.json      | 134 ++++++++--------
 .../clusters/helios/nodes/helios-6.json       | 134 ++++++++--------
 .../clusters/helios/nodes/helios-7.json       | 134 ++++++++--------
 .../clusters/helios/nodes/helios-8.json       | 134 ++++++++--------
 .../clusters/helios/nodes/helios-9.json       | 134 ++++++++--------
 .../sophia/clusters/sol/nodes/sol-1.json      | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-10.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-11.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-12.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-13.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-14.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-15.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-16.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-17.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-18.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-19.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-2.json      | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-20.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-21.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-22.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-23.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-24.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-25.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-26.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-27.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-28.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-29.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-3.json      | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-30.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-31.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-32.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-33.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-34.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-35.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-36.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-37.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-38.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-39.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-4.json      | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-40.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-41.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-42.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-43.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-44.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-45.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-46.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-47.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-48.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-49.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-5.json      | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-50.json     | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-6.json      | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-7.json      | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-8.json      | 104 ++++++------
 .../sophia/clusters/sol/nodes/sol-9.json      | 104 ++++++------
 .../sites/sophia/clusters/sol/sol.json        |   6 +-
 .../sophia/clusters/suno/nodes/suno-1.json    |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-10.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-11.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-12.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-13.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-14.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-15.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-16.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-17.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-18.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-19.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-2.json    |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-20.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-21.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-22.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-23.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-24.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-25.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-26.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-27.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-28.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-29.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-3.json    |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-30.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-31.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-32.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-33.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-34.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-35.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-36.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-37.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-38.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-39.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-4.json    |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-40.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-41.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-42.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-43.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-44.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-45.json   |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-5.json    |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-6.json    |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-7.json    |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-8.json    |  86 +++++-----
 .../sophia/clusters/suno/nodes/suno-9.json    |  86 +++++-----
 .../sites/sophia/clusters/suno/suno.json      |   6 +-
 data/grid5000/sites/sophia/sophia.json        |  16 +-
 .../clusters/pastel/nodes/pastel-1.json       |  96 +++++------
 .../clusters/pastel/nodes/pastel-10.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-11.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-12.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-13.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-14.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-15.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-16.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-17.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-18.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-19.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-2.json       |  96 +++++------
 .../clusters/pastel/nodes/pastel-20.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-21.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-22.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-23.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-24.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-25.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-26.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-27.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-28.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-29.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-3.json       |  96 +++++------
 .../clusters/pastel/nodes/pastel-30.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-31.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-32.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-33.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-34.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-35.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-36.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-37.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-38.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-39.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-4.json       |  96 +++++------
 .../clusters/pastel/nodes/pastel-40.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-41.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-42.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-43.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-44.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-45.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-46.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-47.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-48.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-49.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-5.json       |  96 +++++------
 .../clusters/pastel/nodes/pastel-50.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-51.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-52.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-53.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-54.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-55.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-56.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-57.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-58.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-59.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-6.json       |  96 +++++------
 .../clusters/pastel/nodes/pastel-60.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-61.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-62.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-63.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-64.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-65.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-66.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-67.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-68.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-69.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-7.json       |  96 +++++------
 .../clusters/pastel/nodes/pastel-70.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-71.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-72.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-73.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-74.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-75.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-76.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-77.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-78.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-79.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-8.json       |  96 +++++------
 .../clusters/pastel/nodes/pastel-80.json      |  96 +++++------
 .../clusters/pastel/nodes/pastel-9.json       |  96 +++++------
 .../toulouse/clusters/pastel/pastel.json      |   6 +-
 .../clusters/violette/nodes/violette-1.json   |  96 +++++------
 .../clusters/violette/nodes/violette-10.json  |  96 +++++------
 .../clusters/violette/nodes/violette-11.json  |  96 +++++------
 .../clusters/violette/nodes/violette-12.json  |  96 +++++------
 .../clusters/violette/nodes/violette-13.json  |  96 +++++------
 .../clusters/violette/nodes/violette-14.json  |  96 +++++------
 .../clusters/violette/nodes/violette-15.json  |  96 +++++------
 .../clusters/violette/nodes/violette-16.json  |  96 +++++------
 .../clusters/violette/nodes/violette-17.json  |  96 +++++------
 .../clusters/violette/nodes/violette-18.json  |  96 +++++------
 .../clusters/violette/nodes/violette-19.json  |  96 +++++------
 .../clusters/violette/nodes/violette-2.json   |  96 +++++------
 .../clusters/violette/nodes/violette-20.json  |  96 +++++------
 .../clusters/violette/nodes/violette-21.json  |  96 +++++------
 .../clusters/violette/nodes/violette-22.json  |  96 +++++------
 .../clusters/violette/nodes/violette-23.json  |  96 +++++------
 .../clusters/violette/nodes/violette-24.json  |  96 +++++------
 .../clusters/violette/nodes/violette-25.json  |  96 +++++------
 .../clusters/violette/nodes/violette-26.json  |  96 +++++------
 .../clusters/violette/nodes/violette-27.json  |  96 +++++------
 .../clusters/violette/nodes/violette-28.json  |  96 +++++------
 .../clusters/violette/nodes/violette-29.json  |  96 +++++------
 .../clusters/violette/nodes/violette-3.json   |  96 +++++------
 .../clusters/violette/nodes/violette-30.json  |  96 +++++------
 .../clusters/violette/nodes/violette-31.json  |  96 +++++------
 .../clusters/violette/nodes/violette-32.json  |  96 +++++------
 .../clusters/violette/nodes/violette-33.json  |  96 +++++------
 .../clusters/violette/nodes/violette-34.json  |  96 +++++------
 .../clusters/violette/nodes/violette-35.json  |  96 +++++------
 .../clusters/violette/nodes/violette-36.json  |  96 +++++------
 .../clusters/violette/nodes/violette-37.json  |  96 +++++------
 .../clusters/violette/nodes/violette-38.json  |  96 +++++------
 .../clusters/violette/nodes/violette-39.json  |  96 +++++------
 .../clusters/violette/nodes/violette-4.json   |  96 +++++------
 .../clusters/violette/nodes/violette-40.json  |  96 +++++------
 .../clusters/violette/nodes/violette-41.json  |  96 +++++------
 .../clusters/violette/nodes/violette-42.json  |  96 +++++------
 .../clusters/violette/nodes/violette-43.json  |  96 +++++------
 .../clusters/violette/nodes/violette-44.json  |  96 +++++------
 .../clusters/violette/nodes/violette-45.json  |  96 +++++------
 .../clusters/violette/nodes/violette-46.json  |  96 +++++------
 .../clusters/violette/nodes/violette-47.json  |  96 +++++------
 .../clusters/violette/nodes/violette-48.json  |  96 +++++------
 .../clusters/violette/nodes/violette-49.json  |  96 +++++------
 .../clusters/violette/nodes/violette-5.json   |  96 +++++------
 .../clusters/violette/nodes/violette-50.json  |  96 +++++------
 .../clusters/violette/nodes/violette-51.json  |  96 +++++------
 .../clusters/violette/nodes/violette-52.json  |  96 +++++------
 .../clusters/violette/nodes/violette-6.json   |  96 +++++------
 .../clusters/violette/nodes/violette-7.json   |  96 +++++------
 .../clusters/violette/nodes/violette-8.json   |  96 +++++------
 .../clusters/violette/nodes/violette-9.json   |  96 +++++------
 .../toulouse/clusters/violette/violette.json  |   6 +-
 data/grid5000/sites/toulouse/toulouse.json    |  14 +-
 1342 files changed, 61557 insertions(+), 61556 deletions(-)
 create mode 120000 data/grid5000/sites/lille/environments/lenny-x64-base-2.3.json

diff --git a/data/grid5000/environments/etch-x64-base-1.0.json b/data/grid5000/environments/etch-x64-base-1.0.json
index 31ab78a1b4f..752bc015096 100644
--- a/data/grid5000/environments/etch-x64-base-1.0.json
+++ b/data/grid5000/environments/etch-x64-base-1.0.json
@@ -1,9 +1,14 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "adcd603db66d9e3da98926174f7d69aa",
-    "path": "/grid5000/images/etch-x64-base-1.0.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    },
+    {
+      "login": "g5k",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,31 +19,26 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version etch for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "etch-x64-base-1.0",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "adcd603db66d9e3da98926174f7d69aa",
+    "path": "/grid5000/images/etch-x64-base-1.0.tgz"
+  },
+  "kernel": "2.6.18-6-amd64",
   "max_open_files": 8192,
   "services": [
 
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    },
-    {
-      "login": "g5k",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.18-6-amd64",
-  "based_on": "Debian version etch for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "etch-x64-base-1.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/etch-x64-base-1.1.json b/data/grid5000/environments/etch-x64-base-1.1.json
index fb834717096..ade2f6955dc 100644
--- a/data/grid5000/environments/etch-x64-base-1.1.json
+++ b/data/grid5000/environments/etch-x64-base-1.1.json
@@ -1,9 +1,14 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "457cc632376c2c4cefd975b36bf65072",
-    "path": "/grid5000/images/etch-x64-base-1.1.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    },
+    {
+      "login": "g5k",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,31 +19,26 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version etch for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "etch-x64-base-1.1",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "457cc632376c2c4cefd975b36bf65072",
+    "path": "/grid5000/images/etch-x64-base-1.1.tgz"
+  },
+  "kernel": "2.6.18-6-amd64",
   "max_open_files": 8192,
   "services": [
 
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    },
-    {
-      "login": "g5k",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.18-6-amd64",
-  "based_on": "Debian version etch for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "etch-x64-base-1.1",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/etch-x64-base-2.0.json b/data/grid5000/environments/etch-x64-base-2.0.json
index 73cb18012fe..f5006630bd8 100644
--- a/data/grid5000/environments/etch-x64-base-2.0.json
+++ b/data/grid5000/environments/etch-x64-base-2.0.json
@@ -1,9 +1,14 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "97ec1fa027e597ee54d7e38f6cd70472",
-    "path": "/grid5000/images/etch-x64-base-2.0.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    },
+    {
+      "login": "g5k",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,31 +19,26 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version etch for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "etch-x64-base-2.0",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "97ec1fa027e597ee54d7e38f6cd70472",
+    "path": "/grid5000/images/etch-x64-base-2.0.tgz"
+  },
+  "kernel": "2.6.18-6-amd64",
   "max_open_files": 8192,
   "services": [
 
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    },
-    {
-      "login": "g5k",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310i, Carri CS-5393B",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.18-6-amd64",
-  "based_on": "Debian version etch for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "etch-x64-base-2.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310i, Carri CS-5393B",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/etch-x64-big-1.0.json b/data/grid5000/environments/etch-x64-big-1.0.json
index de523a7c582..df21720cb14 100644
--- a/data/grid5000/environments/etch-x64-big-1.0.json
+++ b/data/grid5000/environments/etch-x64-big-1.0.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "5ddf6e898c11846dfb3eb9b2def2d2de",
-    "path": "/grid5000/images/etch-x64-big-1.0.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version etch for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "etch-x64-big-1.0",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "5ddf6e898c11846dfb3eb9b2def2d2de",
+    "path": "/grid5000/images/etch-x64-big-1.0.tgz"
+  },
+  "kernel": "2.6.18-6-amd64",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.18-6-amd64",
-  "based_on": "Debian version etch for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "etch-x64-big-1.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/etch-x64-big-1.1.json b/data/grid5000/environments/etch-x64-big-1.1.json
index 2a6c3f82d23..89e172e0363 100644
--- a/data/grid5000/environments/etch-x64-big-1.1.json
+++ b/data/grid5000/environments/etch-x64-big-1.1.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "6c971c97eb2f62c056e343cbe9f4a71d",
-    "path": "/grid5000/images/etch-x64-big-1.1.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version etch for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "etch-x64-big-1.1",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "6c971c97eb2f62c056e343cbe9f4a71d",
+    "path": "/grid5000/images/etch-x64-big-1.1.tgz"
+  },
+  "kernel": "2.6.18-6-amd64",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.18-6-amd64",
-  "based_on": "Debian version etch for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "etch-x64-big-1.1",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/etch-x64-big-2.0.json b/data/grid5000/environments/etch-x64-big-2.0.json
index 5e8a9ecebc5..65c327ca03b 100644
--- a/data/grid5000/environments/etch-x64-big-2.0.json
+++ b/data/grid5000/environments/etch-x64-big-2.0.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "b406634f4d0e0e5859c5ba7936064c2c",
-    "path": "/grid5000/images/etch-x64-big-2.0.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version etch for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "etch-x64-big-2.0",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "b406634f4d0e0e5859c5ba7936064c2c",
+    "path": "/grid5000/images/etch-x64-big-2.0.tgz"
+  },
+  "kernel": "2.6.18-6-amd64",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310, Carri CS-5393B",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.18-6-amd64",
-  "based_on": "Debian version etch for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "etch-x64-big-2.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310, Carri CS-5393B",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/etch-x64-nfs-1.0.json b/data/grid5000/environments/etch-x64-nfs-1.0.json
index 5f82dd420e3..c07558d7b2f 100644
--- a/data/grid5000/environments/etch-x64-nfs-1.0.json
+++ b/data/grid5000/environments/etch-x64-nfs-1.0.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "c76462698ae0480aaa48c9b707b96da5",
-    "path": "/grid5000/images/etch-x64-nfs-1.0.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version etch for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "etch-x64-nfs-1.0",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "c76462698ae0480aaa48c9b707b96da5",
+    "path": "/grid5000/images/etch-x64-nfs-1.0.tgz"
+  },
+  "kernel": "2.6.18-6-amd64",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.18-6-amd64",
-  "based_on": "Debian version etch for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "etch-x64-nfs-1.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/etch-x64-nfs-1.1.json b/data/grid5000/environments/etch-x64-nfs-1.1.json
index 1b688e1559a..8783ac23f6b 100644
--- a/data/grid5000/environments/etch-x64-nfs-1.1.json
+++ b/data/grid5000/environments/etch-x64-nfs-1.1.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "303740c75b7a74c94bb5909d3aa8ac4f",
-    "path": "/grid5000/images/etch-x64-nfs-1.1.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version etch for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "etch-x64-nfs-1.1",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "303740c75b7a74c94bb5909d3aa8ac4f",
+    "path": "/grid5000/images/etch-x64-nfs-1.1.tgz"
+  },
+  "kernel": "2.6.18-6-amd64",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.18-6-amd64",
-  "based_on": "Debian version etch for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "etch-x64-nfs-1.1",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/etch-x64-nfs-2.0.json b/data/grid5000/environments/etch-x64-nfs-2.0.json
index 9edfa5d3633..bf1d95d9630 100644
--- a/data/grid5000/environments/etch-x64-nfs-2.0.json
+++ b/data/grid5000/environments/etch-x64-nfs-2.0.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "e564f3b80ba37eb01d967507a05dd5ca",
-    "path": "/grid5000/images/etch-x64-nfs-2.0.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version etch for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "etch-x64-nfs-2.0",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "e564f3b80ba37eb01d967507a05dd5ca",
+    "path": "/grid5000/images/etch-x64-nfs-2.0.tgz"
+  },
+  "kernel": "2.6.18-6-amd64",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310, Carri CS-5393B",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.18-6-amd64",
-  "based_on": "Debian version etch for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "etch-x64-nfs-2.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310, Carri CS-5393B",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/etch-x64-xen-1.0.json b/data/grid5000/environments/etch-x64-xen-1.0.json
index 7380eab5205..d6a3d234aa2 100644
--- a/data/grid5000/environments/etch-x64-xen-1.0.json
+++ b/data/grid5000/environments/etch-x64-xen-1.0.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "42cd6233ff42d0c343a4a93ed6017d97",
-    "path": "/grid5000/images/etch-x64-xen-1.0.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version etch for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "etch-x64-xen-1.0",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "42cd6233ff42d0c343a4a93ed6017d97",
+    "path": "/grid5000/images/etch-x64-xen-1.0.tgz"
+  },
+  "kernel": "2.6.18-6-xen-amd64",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
-  "tcp_bandwidth": 1000000000,
   "state": "testing",
-  "kernel": "2.6.18-6-xen-amd64",
-  "based_on": "Debian version etch for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "etch-x64-xen-1.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-base-0.9.json b/data/grid5000/environments/lenny-x64-base-0.9.json
index e4f44abc83b..8287e2075db 100644
--- a/data/grid5000/environments/lenny-x64-base-0.9.json
+++ b/data/grid5000/environments/lenny-x64-base-0.9.json
@@ -1,9 +1,14 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "c1913bf8de22f52ef213151c25208a4a",
-    "path": "/grid5000/images/lenny-x64-base-0.9.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    },
+    {
+      "login": "g5k",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,31 +19,26 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version lenny for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "lenny-x64-base-0.9",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "c1913bf8de22f52ef213151c25208a4a",
+    "path": "/grid5000/images/lenny-x64-base-0.9.tgz"
+  },
+  "kernel": "2.6.24.3",
   "max_open_files": 8192,
   "services": [
 
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    },
-    {
-      "login": "g5k",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.24.3",
-  "based_on": "Debian version lenny for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-base-0.9",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-base-1.0.json b/data/grid5000/environments/lenny-x64-base-1.0.json
index 9bf6c8c513b..bdc04689e5b 100644
--- a/data/grid5000/environments/lenny-x64-base-1.0.json
+++ b/data/grid5000/environments/lenny-x64-base-1.0.json
@@ -1,9 +1,14 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "1b60d38c016b844024bc541efb212573",
-    "path": "/grid5000/images/lenny-x64-base-1.0.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    },
+    {
+      "login": "g5k",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,31 +19,26 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version lenny for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "lenny-x64-base-1.0",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "1b60d38c016b844024bc541efb212573",
+    "path": "/grid5000/images/lenny-x64-base-1.0.tgz"
+  },
+  "kernel": "2.6.26.2",
   "max_open_files": 8192,
   "services": [
 
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    },
-    {
-      "login": "g5k",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.26.2",
-  "based_on": "Debian version lenny for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-base-1.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-base-2.0.json b/data/grid5000/environments/lenny-x64-base-2.0.json
index e2c50babf1b..ab0bbc1d5df 100644
--- a/data/grid5000/environments/lenny-x64-base-2.0.json
+++ b/data/grid5000/environments/lenny-x64-base-2.0.json
@@ -1,9 +1,14 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "43217a044daf45368231f405f7d63b59",
-    "path": "/grid5000/images/lenny-x64-base-2.0.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    },
+    {
+      "login": "g5k",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,31 +19,26 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version lenny for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "lenny-x64-base-2.0",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "43217a044daf45368231f405f7d63b59",
+    "path": "/grid5000/images/lenny-x64-base-2.0.tgz"
+  },
+  "kernel": "2.6.26.2",
   "max_open_files": 8192,
   "services": [
 
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    },
-    {
-      "login": "g5k",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310, Carri CS-5393B",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.26.2",
-  "based_on": "Debian version lenny for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-base-2.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310, Carri CS-5393B",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-base-2.1.json b/data/grid5000/environments/lenny-x64-base-2.1.json
index 5adf343dee3..a63157930e0 100644
--- a/data/grid5000/environments/lenny-x64-base-2.1.json
+++ b/data/grid5000/environments/lenny-x64-base-2.1.json
@@ -1,9 +1,14 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "4d63ad5aa069916da98e3c074297db41",
-    "path": "/grid5000/images/lenny-x64-base-2.1.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    },
+    {
+      "login": "g5k",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,31 +19,26 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version lenny for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "lenny-x64-base-2.1",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "4d63ad5aa069916da98e3c074297db41",
+    "path": "/grid5000/images/lenny-x64-base-2.1.tgz"
+  },
+  "kernel": "2.6.26.2",
   "max_open_files": 8192,
   "services": [
 
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    },
-    {
-      "login": "g5k",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "griffon , grelon , sagittaire , capricorne , netgdx , gdx , bordeplage , bordereau , parapide , paramount , paraquad , paradent , azur , helios , sol , suno , edel , genepi , adonis , chuque , chinqchint , chicon , chti",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.26.2",
-  "based_on": "Debian version lenny for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-base-2.1",
+  "valid_on": "griffon , grelon , sagittaire , capricorne , netgdx , gdx , bordeplage , bordereau , parapide , paramount , paraquad , paradent , azur , helios , sol , suno , edel , genepi , adonis , chuque , chinqchint , chicon , chti",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-base-2.2.json b/data/grid5000/environments/lenny-x64-base-2.2.json
index 5dc4a6d6e0e..25f64e1e3c2 100644
--- a/data/grid5000/environments/lenny-x64-base-2.2.json
+++ b/data/grid5000/environments/lenny-x64-base-2.2.json
@@ -1,9 +1,14 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "dedcda842737b61fc47d73b082edc9c4",
-    "path": "/grid5000/images/lenny-x64-base-2.2.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    },
+    {
+      "login": "g5k",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,31 +19,26 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version lenny for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "lenny-x64-base-2.2",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "dedcda842737b61fc47d73b082edc9c4",
+    "path": "/grid5000/images/lenny-x64-base-2.2.tgz"
+  },
+  "kernel": "2.6.26.2",
   "max_open_files": 8192,
   "services": [
 
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    },
-    {
-      "login": "g5k",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "griffon , grelon , sagittaire , capricorne , netgdx , gdx , bordeplage , bordereau , parapide , paramount , paraquad , paradent , azur , helios , sol , suno , edel , genepi , adonis , chuque , chinqchint , chicon , chti",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.26.2",
-  "based_on": "Debian version lenny for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-base-2.2",
+  "valid_on": "griffon , grelon , sagittaire , capricorne , netgdx , gdx , bordeplage , bordereau , parapide , paramount , paraquad , paradent , azur , helios , sol , suno , edel , genepi , adonis , chuque , chinqchint , chicon , chti",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-base-2.3.json b/data/grid5000/environments/lenny-x64-base-2.3.json
index ec3a3a61f2f..6ba15360447 100644
--- a/data/grid5000/environments/lenny-x64-base-2.3.json
+++ b/data/grid5000/environments/lenny-x64-base-2.3.json
@@ -1,9 +1,14 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "ae5a1ab50f5654c47ddfb2d5ee2ed978",
-    "path": "/grid5000/images/lenny-x64-base-2.3.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    },
+    {
+      "login": "g5k",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,31 +19,26 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version lenny for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "lenny-x64-base-2.3",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "ae5a1ab50f5654c47ddfb2d5ee2ed978",
+    "path": "/grid5000/images/lenny-x64-base-2.3.tgz"
+  },
+  "kernel": "2.6.26.2",
   "max_open_files": 8192,
   "services": [
 
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    },
-    {
-      "login": "g5k",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "griffon , grelon , sagittaire , capricorne , netgdx , gdx , bordeplage , bordereau , parapide , paramount , paraquad , paradent , azur , helios , sol , suno , edel , genepi , adonis , chuque , chinqchint , chicon , chti",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.26.2",
-  "based_on": "Debian version lenny for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-base-2.3",
+  "valid_on": "griffon , grelon , sagittaire , capricorne , netgdx , gdx , bordeplage , bordereau , parapide , paramount , paraquad , paradent , azur , helios , sol , suno , edel , genepi , adonis , chuque , chinqchint , chicon , chti",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-big-0.9.json b/data/grid5000/environments/lenny-x64-big-0.9.json
index 9694958acd9..87445eba910 100644
--- a/data/grid5000/environments/lenny-x64-big-0.9.json
+++ b/data/grid5000/environments/lenny-x64-big-0.9.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "ead20673233d0b9162ba56481d596add",
-    "path": "/grid5000/images/lenny-x64-big-0.9.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version lenny for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "lenny-x64-big-0.9",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "ead20673233d0b9162ba56481d596add",
+    "path": "/grid5000/images/lenny-x64-big-0.9.tgz"
+  },
+  "kernel": "2.6.24.3",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.24.3",
-  "based_on": "Debian version lenny for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-big-0.9",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-big-1.0.json b/data/grid5000/environments/lenny-x64-big-1.0.json
index f68b08932c3..8a1a5048eb1 100644
--- a/data/grid5000/environments/lenny-x64-big-1.0.json
+++ b/data/grid5000/environments/lenny-x64-big-1.0.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "b2e48586472579ac2b908816175e4aa6",
-    "path": "/grid5000/images/lenny-x64-big-1.0.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version lenny for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "lenny-x64-big-1.0",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "b2e48586472579ac2b908816175e4aa6",
+    "path": "/grid5000/images/lenny-x64-big-1.0.tgz"
+  },
+  "kernel": "2.6.26.2",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.26.2",
-  "based_on": "Debian version lenny for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-big-1.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-big-2.0.json b/data/grid5000/environments/lenny-x64-big-2.0.json
index 65399d00ed0..83e69cb7702 100644
--- a/data/grid5000/environments/lenny-x64-big-2.0.json
+++ b/data/grid5000/environments/lenny-x64-big-2.0.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "70a31ddd4db68c63b8364393dd379b75",
-    "path": "/grid5000/images/lenny-x64-big-2.0.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version lenny for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "lenny-x64-big-2.0",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "70a31ddd4db68c63b8364393dd379b75",
+    "path": "/grid5000/images/lenny-x64-big-2.0.tgz"
+  },
+  "kernel": "2.6.26.2",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310, Carri CS-5393B",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.26.2",
-  "based_on": "Debian version lenny for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-big-2.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310, Carri CS-5393B",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-big-2.1.json b/data/grid5000/environments/lenny-x64-big-2.1.json
index 93359975834..08ba926a56c 100644
--- a/data/grid5000/environments/lenny-x64-big-2.1.json
+++ b/data/grid5000/environments/lenny-x64-big-2.1.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "b85027090ace01bb5fc34c951ec5d5b4",
-    "path": "/grid5000/images/lenny-x64-big-2.1.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version lenny for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "lenny-x64-big-2.1",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "b85027090ace01bb5fc34c951ec5d5b4",
+    "path": "/grid5000/images/lenny-x64-big-2.1.tgz"
+  },
+  "kernel": "2.6.26.2",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "griffon , grelon , sagittaire , capricorne , netgdx , gdx , bordeplage , bordereau , parapide , paramount , paraquad , paradent , azur , helios , sol , suno , edel , genepi , adonis , chuque , chinqchint , chicon , chti",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.26.2",
-  "based_on": "Debian version lenny for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-big-2.1",
+  "valid_on": "griffon , grelon , sagittaire , capricorne , netgdx , gdx , bordeplage , bordereau , parapide , paramount , paraquad , paradent , azur , helios , sol , suno , edel , genepi , adonis , chuque , chinqchint , chicon , chti",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-big-2.2.json b/data/grid5000/environments/lenny-x64-big-2.2.json
index 74083df51dc..0205a08b77e 100644
--- a/data/grid5000/environments/lenny-x64-big-2.2.json
+++ b/data/grid5000/environments/lenny-x64-big-2.2.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "e87433ec446ef855a5f28a6a2fe44aaf",
-    "path": "/grid5000/images/lenny-x64-big-2.2.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version lenny for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "lenny-x64-big-2.2",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "e87433ec446ef855a5f28a6a2fe44aaf",
+    "path": "/grid5000/images/lenny-x64-big-2.2.tgz"
+  },
+  "kernel": "2.6.26.2",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "griffon , grelon , sagittaire , capricorne , netgdx , gdx , bordeplage , bordereau , parapide , paramount , paraquad , paradent , azur , helios , sol , suno , edel , genepi , adonis , chuque , chinqchint , chicon , chti",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.26.2",
-  "based_on": "Debian version lenny for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-big-2.2",
+  "valid_on": "griffon , grelon , sagittaire , capricorne , netgdx , gdx , bordeplage , bordereau , parapide , paramount , paraquad , paradent , azur , helios , sol , suno , edel , genepi , adonis , chuque , chinqchint , chicon , chti",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-nfs-0.9.json b/data/grid5000/environments/lenny-x64-nfs-0.9.json
index e84ea7ada28..dd8b8d49401 100644
--- a/data/grid5000/environments/lenny-x64-nfs-0.9.json
+++ b/data/grid5000/environments/lenny-x64-nfs-0.9.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "7975882dec6bde601346c0152e161638",
-    "path": "/grid5000/images/lenny-x64-nfs-0.9.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version lenny for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "lenny-x64-nfs-0.9",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "7975882dec6bde601346c0152e161638",
+    "path": "/grid5000/images/lenny-x64-nfs-0.9.tgz"
+  },
+  "kernel": "2.6.24.3",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.24.3",
-  "based_on": "Debian version lenny for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-nfs-0.9",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-nfs-1.0.json b/data/grid5000/environments/lenny-x64-nfs-1.0.json
index 13cfb3c9b69..2efeed03474 100644
--- a/data/grid5000/environments/lenny-x64-nfs-1.0.json
+++ b/data/grid5000/environments/lenny-x64-nfs-1.0.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "89448d214db5477e3ac6ef39ed0e7f6e",
-    "path": "/grid5000/images/lenny-x64-nfs-1.0.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version lenny for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "lenny-x64-nfs-1.0",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "89448d214db5477e3ac6ef39ed0e7f6e",
+    "path": "/grid5000/images/lenny-x64-nfs-1.0.tgz"
+  },
+  "kernel": "2.6.26.2",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.26.2",
-  "based_on": "Debian version lenny for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-nfs-1.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-nfs-2.0.json b/data/grid5000/environments/lenny-x64-nfs-2.0.json
index 170231f62b7..53356383e90 100644
--- a/data/grid5000/environments/lenny-x64-nfs-2.0.json
+++ b/data/grid5000/environments/lenny-x64-nfs-2.0.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "995f0dad8a0462b47e4fc22ae4e32369",
-    "path": "/grid5000/images/lenny-x64-nfs-2.0.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version lenny for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "lenny-x64-nfs-2.0",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "995f0dad8a0462b47e4fc22ae4e32369",
+    "path": "/grid5000/images/lenny-x64-nfs-2.0.tgz"
+  },
+  "kernel": "2.6.26.2",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310, Carri CS-5393B",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.26.2",
-  "based_on": "Debian version lenny for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-nfs-2.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310, Carri CS-5393B",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-nfs-2.1.json b/data/grid5000/environments/lenny-x64-nfs-2.1.json
index a95de411a83..447ba9b1257 100644
--- a/data/grid5000/environments/lenny-x64-nfs-2.1.json
+++ b/data/grid5000/environments/lenny-x64-nfs-2.1.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "b0756d201e0719c40785b746b8d5f395",
-    "path": "/grid5000/images/lenny-x64-nfs-2.1.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version lenny for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "lenny-x64-nfs-2.1",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "b0756d201e0719c40785b746b8d5f395",
+    "path": "/grid5000/images/lenny-x64-nfs-2.1.tgz"
+  },
+  "kernel": "2.6.26.2",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "griffon , grelon , sagittaire , capricorne , netgdx , gdx , bordeplage , bordereau , parapide , paramount , paraquad , paradent , azur , helios , sol , suno , edel , genepi , adonis , chuque , chinqchint , chicon , chti",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.26.2",
-  "based_on": "Debian version lenny for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-nfs-2.1",
+  "valid_on": "griffon , grelon , sagittaire , capricorne , netgdx , gdx , bordeplage , bordereau , parapide , paramount , paraquad , paradent , azur , helios , sol , suno , edel , genepi , adonis , chuque , chinqchint , chicon , chti",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-nfs-2.2.json b/data/grid5000/environments/lenny-x64-nfs-2.2.json
index 7e6471dc6d1..8d317fa3cc9 100644
--- a/data/grid5000/environments/lenny-x64-nfs-2.2.json
+++ b/data/grid5000/environments/lenny-x64-nfs-2.2.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "bd1ba75d86c226ba7e0e7153d892cc93",
-    "path": "/grid5000/images/lenny-x64-nfs-2.2.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version lenny for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "lenny-x64-nfs-2.2",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "bd1ba75d86c226ba7e0e7153d892cc93",
+    "path": "/grid5000/images/lenny-x64-nfs-2.2.tgz"
+  },
+  "kernel": "2.6.26.2",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "griffon , grelon , sagittaire , capricorne , netgdx , gdx , bordeplage , bordereau , parapide , paramount , paraquad , paradent , azur , helios , sol , suno , edel , genepi , adonis , chuque , chinqchint , chicon , chti",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.26.2",
-  "based_on": "Debian version lenny for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-nfs-2.2",
+  "valid_on": "griffon , grelon , sagittaire , capricorne , netgdx , gdx , bordeplage , bordereau , parapide , paramount , paraquad , paradent , azur , helios , sol , suno , edel , genepi , adonis , chuque , chinqchint , chicon , chti",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-xen-1.0.json b/data/grid5000/environments/lenny-x64-xen-1.0.json
index 19b16a6288e..dcfe39bab23 100644
--- a/data/grid5000/environments/lenny-x64-xen-1.0.json
+++ b/data/grid5000/environments/lenny-x64-xen-1.0.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "3e292c686c3ed0b417e44fdde5ec1771",
-    "path": "/grid5000/images/lenny-x64-xen-1.0.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,27 +15,26 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version etch for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "lenny-x64-xen-1.0",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "3e292c686c3ed0b417e44fdde5ec1771",
+    "path": "/grid5000/images/lenny-x64-xen-1.0.tgz"
+  },
+  "kernel": "2.6.26-2-xen-amd64",
   "max_open_files": 8192,
   "services": [
 
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
-  "tcp_bandwidth": 1000000000,
   "state": "testing",
-  "kernel": "2.6.26-2-xen-amd64",
-  "based_on": "Debian version etch for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-xen-1.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/sid-x64-base-1.0.json b/data/grid5000/environments/sid-x64-base-1.0.json
index d60f2174778..bda57d818d4 100644
--- a/data/grid5000/environments/sid-x64-base-1.0.json
+++ b/data/grid5000/environments/sid-x64-base-1.0.json
@@ -1,9 +1,14 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
-    "path": "/grid5000/images/sid-x64-base-1.0.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    },
+    {
+      "login": "g5k",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,31 +19,26 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version sid for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "sid-x64-base-1.0",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
+    "path": "/grid5000/images/sid-x64-base-1.0.tgz"
+  },
+  "kernel": "2.6.18-8",
   "max_open_files": 8192,
   "services": [
 
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    },
-    {
-      "login": "g5k",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.18-8",
-  "based_on": "Debian version sid for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "sid-x64-base-1.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/sid-x64-base-1.1.json b/data/grid5000/environments/sid-x64-base-1.1.json
index fa941e2168b..7135072f67d 100644
--- a/data/grid5000/environments/sid-x64-base-1.1.json
+++ b/data/grid5000/environments/sid-x64-base-1.1.json
@@ -1,9 +1,14 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "756ccc2096e9feacde85500d33683dba",
-    "path": "/grid5000/images/sid-x64-base-1.1.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    },
+    {
+      "login": "g5k",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,31 +19,26 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version sid for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "sid-x64-base-1.1",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "756ccc2096e9feacde85500d33683dba",
+    "path": "/grid5000/images/sid-x64-base-1.1.tgz"
+  },
+  "kernel": "2.6.24",
   "max_open_files": 8192,
   "services": [
 
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    },
-    {
-      "login": "g5k",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, HP DL385G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.24",
-  "based_on": "Debian version sid for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "sid-x64-base-1.1",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, HP DL385G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/sid-x64-big-1.1.json b/data/grid5000/environments/sid-x64-big-1.1.json
index f0e94f635a0..dc1d3ac933b 100644
--- a/data/grid5000/environments/sid-x64-big-1.1.json
+++ b/data/grid5000/environments/sid-x64-big-1.1.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "d514bee74404ed5f64ff41b2f60c4f7f",
-    "path": "/grid5000/images/sid-x64-big-1.1.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version sid for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "sid-x64-big-1.1",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "d514bee74404ed5f64ff41b2f60c4f7f",
+    "path": "/grid5000/images/sid-x64-big-1.1.tgz"
+  },
+  "kernel": "2.6.24.3",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.24.3",
-  "based_on": "Debian version sid for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "sid-x64-big-1.1",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/sid-x64-nfs-1.0.json b/data/grid5000/environments/sid-x64-nfs-1.0.json
index f1b067444df..5713eb5a3a4 100644
--- a/data/grid5000/environments/sid-x64-nfs-1.0.json
+++ b/data/grid5000/environments/sid-x64-nfs-1.0.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "6e004d1ac25e86a1dadc09d28f968eb5",
-    "path": "/grid5000/images/sid-x64-nfs-1.0.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version sid for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "sid-x64-nfs-1.0",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "6e004d1ac25e86a1dadc09d28f968eb5",
+    "path": "/grid5000/images/sid-x64-nfs-1.0.tgz"
+  },
+  "kernel": "2.6.18-4",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.18-4",
-  "based_on": "Debian version sid for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "sid-x64-nfs-1.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/sid-x64-nfs-1.1.json b/data/grid5000/environments/sid-x64-nfs-1.1.json
index a76cd448a53..6466af8f67f 100644
--- a/data/grid5000/environments/sid-x64-nfs-1.1.json
+++ b/data/grid5000/environments/sid-x64-nfs-1.1.json
@@ -1,9 +1,10 @@
 {
-  "type": "environment",
-  "file": {
-    "md5": "4218f5a9bfea4a759fa684db1ec4d89c",
-    "path": "/grid5000/images/sid-x64-nfs-1.1.tgz"
-  },
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
   "applications": [
     "Vim",
     "XEmacs",
@@ -14,28 +15,27 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version sid for amd64",
   "consoles": [
     {
       "bps": 34800,
       "port": "ttyS0"
     }
   ],
-  "uid": "sid-x64-nfs-1.1",
-  "x11_forwarding": true,
+  "file": {
+    "md5": "4218f5a9bfea4a759fa684db1ec4d89c",
+    "path": "/grid5000/images/sid-x64-nfs-1.1.tgz"
+  },
+  "kernel": "2.6.24.3",
   "max_open_files": 8192,
   "services": [
     "ldap",
     "nfs"
   ],
-  "accounts": [
-    {
-      "login": "root",
-      "password": "grid5000"
-    }
-  ],
-  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100",
-  "tcp_bandwidth": 1000000000,
   "state": "stable",
-  "kernel": "2.6.24.3",
-  "based_on": "Debian version sid for amd64"
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "sid-x64-nfs-1.1",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100",
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/bordeaux.json b/data/grid5000/sites/bordeaux/bordeaux.json
index 7f1dd8ebfe0..a79c95cbb66 100755
--- a/data/grid5000/sites/bordeaux/bordeaux.json
+++ b/data/grid5000/sites/bordeaux/bordeaux.json
@@ -1,14 +1,14 @@
 {
-  "type": "site",
-  "sys_admin_contact": "bordeaux-staff@lists.grid5000.fr",
-  "location": "Bordeaux, France",
-  "uid": "bordeaux",
-  "security_contact": "bordeaux-staff@lists.grid5000.fr",
-  "web": "http://www.grid5000.fr/mediawiki/index.php/Bordeaux:Home",
-  "user_support_contact": "bordeaux-staff@lists.grid5000.fr",
+  "description": "Grid5000 Bordeaux site",
+  "email_contact": "bordeaux-staff@lists.grid5000.fr",
   "latitude": 44.833333,
+  "location": "Bordeaux, France",
   "longitude": -0.566667,
   "name": "Bordeaux",
-  "description": "Grid5000 Bordeaux site",
-  "email_contact": "bordeaux-staff@lists.grid5000.fr"
+  "security_contact": "bordeaux-staff@lists.grid5000.fr",
+  "sys_admin_contact": "bordeaux-staff@lists.grid5000.fr",
+  "type": "site",
+  "uid": "bordeaux",
+  "user_support_contact": "bordeaux-staff@lists.grid5000.fr",
+  "web": "http://www.grid5000.fr/mediawiki/index.php/Bordeaux:Home"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/bordeplage.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/bordeplage.json
index 3bb167334e5..8d7288b340b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/bordeplage.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/bordeplage.json
@@ -1,7 +1,7 @@
 {
-  "type": "cluster",
-  "model": "Dell PowerEdge 1855",
-  "uid": "bordeplage",
   "created_at": null,
-  "misc": "Motherboard Bios version: A05 ;IPMI version 1.5: Firware revision 1.6"
+  "misc": "Motherboard Bios version: A05 ;IPMI version 1.5: Firware revision 1.6",
+  "model": "Dell PowerEdge 1855",
+  "type": "cluster",
+  "uid": "bordeplage"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
index a257fa36ddb..250b2590a54 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-1",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.1",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-1-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.1"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.51",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.51"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.51",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-1-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.51"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
index c29a738ce81..09cdb454f04 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-10",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.10",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-10-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.10"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.60",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-10.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.60"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.60",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-10-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.60"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
index 33fc4ebb07e..b010db51295 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-11",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.11",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-11-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.11"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.61",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-11.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.61"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.61",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-11-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.61"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
index a8edd4b494a..5b57f40a907 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-12",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.12",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-12-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.12"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.62",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-12.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.62"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.62",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-12-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.62"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
index af6471628c3..17fbe8f49cf 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-13",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.13",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-13-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.13"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.63",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-13.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.63"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.63",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-13-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.63"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
index ffaa62c05f7..f1c246eec68 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-14",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.14",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-14-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.14"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.64",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-14.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.64"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.64",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-14-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.64"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
index 1bdf67b9bfc..6fdb08c2e54 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-15",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.15",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-15-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.15"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.65",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-15.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.65"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.65",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-15-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.65"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
index 64f80cfef9b..a985a85c5f9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-16",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.16",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-16-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.16"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.66",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-16.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.66"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.66",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-16-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.66"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
index 1b01f62c95c..369ca03b9a9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-17",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.17",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-17-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.17"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.67",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-17.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.67"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.67",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-17-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.67"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
index dc6a5a5ddc1..2f78d362304 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-18",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.18",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-18-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.18"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.68",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-18.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.68"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.68",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-18-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.68"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
index 6015d5632ac..1a1d62036fd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-19",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.19",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-19-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.19"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.69",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-19.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.69"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.69",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-19-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.69"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
index 5a1584acd25..e6a474c5438 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-2",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.2",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-2-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.2"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.52",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-2.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.52"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.52",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-2-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.52"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
index 28671768331..d9a6daf3a88 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-20",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.20",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-20-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.20"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.70",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-20.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.70"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.70",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-20-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.70"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
index 991a1f99321..095eb6ccf5a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-21",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.21",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-21-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.21"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.71",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-21.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.71"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.71",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-21-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.71"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
index a659c0cd882..e58ab607894 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-22",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.22",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-22-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.22"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.72",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-22.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.72"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.72",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-22-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.72"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
index 4162404d784..410d8b9d5ba 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-23",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.23",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-23-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.23"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.73",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-23.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.73"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.73",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-23-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.73"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
index d6c6f272831..2aa853ed273 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-24",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.24",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-24-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.24"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.74",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-24.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.74"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.74",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-24-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.74"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
index e139d721c59..23a7ce2f11b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-25",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.25",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-25-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.25"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.75",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-25.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.75"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.75",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-25-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.75"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
index 550d563ba70..902874d4b5f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-26",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.26",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-26-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.26"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.76",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-26.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.76"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.76",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-26-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.76"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
index 0267c702552..a2a928e222b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-27",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.27",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-27-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.27"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.77",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-27.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.77"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.77",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-27-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.77"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
index 7702c9a4319..4c06d31f5c4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-28",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.28",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-28-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.28"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.78",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-28.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.78"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.78",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-28-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.78"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
index 8b4f8e68514..c4116269a16 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-29",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.29",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-29-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.29"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.79",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-29.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.79"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.79",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-29-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.79"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
index 22c5c2a94a6..47f380b8015 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-3",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.3",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-3-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.3"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.53",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-3.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.53"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.53",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-3-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.53"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
index 6bcd5aaa27c..ce96375b395 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-30",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.30",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-30-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.30"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.80",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-30.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.80"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.80",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-30-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.80"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
index 2e7dcfd7a65..52d450a3f2a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-31",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.31",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-31-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.31"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.81",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-31.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.81"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.81",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-31-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.81"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
index 79a9d5f6013..b35db7e79b1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-32",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.32",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-32-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.32"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.82",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-32.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.82"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.82",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-32-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.82"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
index d450673d233..f180e91077d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-33",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.33",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-33-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.33"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.83",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-33.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.83"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.83",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-33-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.83"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
index 19c068ede88..9a9dbd7274b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-34",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.34",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-34-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.34"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.84",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-34.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.84"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.84",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-34-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.84"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
index a3d5f986002..cbbaf54e08b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-35",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.35",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-35-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.35"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.85",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-35.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.85"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.85",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-35-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.85"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
index bb3c4d61e60..38b5fc99339 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-36",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.36",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-36-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.36"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.86",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-36.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.86"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.86",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-36-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.86"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
index 69d5549a80b..6d47b89e92d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-37",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.37",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-37-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.37"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.87",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-37.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.87"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.87",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-37-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.87"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
index 06b53b31df9..2d6730e5dd4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-38",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.38",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-38-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.38"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.88",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-38.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.88"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.88",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-38-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.88"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
index 884dc0050ff..6af56be43ce 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-39",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.39",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-39-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.39"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.89",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-39.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.89"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.89",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-39-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.89"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
index d33d6f65bca..2965b264a60 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-4",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.4",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-4-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.4"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.54",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-4.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.54"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.54",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-4-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.54"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
index e2723913fb4..cbf856b6f4e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-40",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.40",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-40-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.40"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.90",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-40.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.90"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.90",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-40-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.90"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
index aeebaca91e8..462df6751ba 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-41",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.41",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-41-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.41"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.91",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-41.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.91"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.91",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-41-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.91"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
index 694ec8b5633..8805030b239 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-42",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.42",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-42-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.42"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.92",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-42.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.92"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.92",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-42-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.92"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
index 92a19891f49..e1f4f52f2fb 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-43",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.43",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-43-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.43"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.93",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-43.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.93"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.93",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-43-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.93"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
index 3ac3c1f5a53..a4fb739bad3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-44",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.44",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-44-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.44"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.94",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-44.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.94"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.94",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-44-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.94"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
index 6dc226d2e5f..09837699c1d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-45",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.45",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-45-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.45"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.95",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-45.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.95"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.95",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-45-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.95"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
index 5470db59e2c..003dc0b1a7f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-46",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.46",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-46-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.46"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.96",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-46.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.96"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.96",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-46-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.96"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
index f8e184508a4..0a4dfeffcef 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-47",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.47",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-47-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.47"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.97",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-47.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.97"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.97",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-47-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.97"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
index d14ce3be159..3dd54e06e22 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-48",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.48",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-48-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.48"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.98",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-48.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.98"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.98",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-48-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.98"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
index 7cbad9e7af6..b5842e8d79c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-49",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.49",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-49-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.49"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.99",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-49.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.99"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.99",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-49-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.99"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
index 7b7b37d8be7..174334a74a5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-5",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.5",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-5-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.5"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.55",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-5.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.55"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.55",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-5-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.55"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
index 06a1bfe52c3..95601fe17b3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-50",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.50",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-50-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.50"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.100",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-50.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.100"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.100",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-50-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.100"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
index a64d80323ff..c937169d97d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-51",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.51",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-51-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.51"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.101",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-51.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.101"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.101",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-51-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.101"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
index b9f7bc6b3ed..ea3cd22c485 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-6",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.6",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-6-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.6"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.56",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-6.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.56"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.56",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-6-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.56"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
index 3a7918493ff..ee0f0f99e68 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-7",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.7",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-7-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.7"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.57",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-7.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.57"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.57",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-7-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.57"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
index 5ad47ec0191..a4888501901 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-8",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.8",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-8-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.8"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.58",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-8.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.58"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.58",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-8-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.58"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
index aff9a9a3d0f..a2917386aa2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
@@ -1,91 +1,91 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
-  "uid": "bordeplage-9",
-  "processor": {
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": 16384,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 2
   },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "192.168.132.9",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "bordeplage-9-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "192.168.132.9"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.59",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": true,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-9.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.59"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.59",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "e1000",
-      "version": "82546GB Gigabit Ethernet Controller",
       "mounted": false,
-      "vendor": "Intel",
-      "management": false,
       "network_address": "bordeplage-9-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.59"
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 16384,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 2147483648,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordeplage-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/bordereau.json b/data/grid5000/sites/bordeaux/clusters/bordereau/bordereau.json
index eb05df23b78..932c6d64a3d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/bordereau.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/bordereau.json
@@ -1,7 +1,7 @@
 {
-  "type": "cluster",
-  "model": "IBM System x3455",
-  "uid": "bordereau",
   "created_at": "Mon, 01 Oct 2007 12:00:00 GMT",
-  "misc": "IPMI 2.0, BIOS Version 1.32"
+  "misc": "IPMI 2.0, BIOS Version 1.32",
+  "model": "IBM System x3455",
+  "type": "cluster",
+  "uid": "bordereau"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
index a851d18e196..3ee862c2177 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-1",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.102",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.102"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.102",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-1-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.102"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
index 3d3b6bc7ad6..017e4288991 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-10",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.111",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-10.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.111"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.111",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-10-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.111"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
index 7c9c12210ca..9b66978e2ac 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-11",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.112",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-11.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.112"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.112",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-11-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.112"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
index 6dcde415c6f..e63dd48e643 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-12",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.113",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-12.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.113"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.113",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-12-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.113"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
index 2c6c54451f9..0459892cd41 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-13",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.114",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-13.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.114"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.114",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-13-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.114"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
index e59f8e4fe49..6f67f219520 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-14",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.115",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-14.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.115"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.115",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-14-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.115"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
index 0b7b34180b5..2136a57eb34 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-15",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.116",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-15.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.116"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.116",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-15-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.116"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
index 94b26277fc1..26a257f76ac 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-16",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.117",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-16.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.117"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.117",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-16-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.117"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
index f73f98585b1..2b1d96bc893 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-17",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.118",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-17.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.118"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.118",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-17-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.118"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
index a29f73b798d..cd87e7cd5c9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-18",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.119",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-18.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.119"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.119",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-18-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.119"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
index ba958aa8978..acedb82c263 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-19",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.120",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-19.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.120"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.120",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-19-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.120"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
index a422682b3c6..dcfbbc87b38 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-2",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.103",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-2.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.103"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.103",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-2-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.103"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
index c9fa848fa96..de763bf7ae8 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-20",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.121",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-20.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.121"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.121",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-20-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.121"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
index 2377a20331f..0341c09d800 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-21",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.122",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-21.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.122"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.122",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-21-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.122"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
index 6e0efdfa37d..ed9b0f9f53c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-22",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.123",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-22.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.123"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.123",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-22-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.123"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
index 565d3e7e3a4..e3b8e4c27e4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-23",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.124",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-23.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.124"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.124",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-23-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.124"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
index 0a8c103cbf5..55a04bc08b5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-24",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.125",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-24.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.125"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.125",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-24-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.125"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
index a1a5ed139de..9225a20b1fe 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-25",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.126",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-25.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.126"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.126",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-25-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.126"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
index 390d0e5dca4..d6df5084ad9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-26",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.127",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-26.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.127"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.127",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-26-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.127"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
index 23d7c7d80e6..bb4795e9210 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-27",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.128",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-27.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.128"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.128",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-27-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.128"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
index 1cf15d6e863..00b16b6104a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-28",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.129",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-28.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.129"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.129",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-28-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.129"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
index e781458551a..2a2c7b59441 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-29",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.130",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-29.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.130"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.130",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-29-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.130"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
index 99964cd235c..2d9cf5e7fd8 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-3",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.104",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-3.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.104"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.104",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-3-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.104"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
index 7e42bc3ecd3..8d143a1b02c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-30",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.131",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-30.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.131"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.131",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-30-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.131"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
index 4e59237060c..674f377c485 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-31",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.132",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-31.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.132"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.132",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-31-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.132"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
index e23061b67ab..b5c9bc98dd6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-32",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.133",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-32.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.133"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.133",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-32-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.133"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
index 2f9047b89b7..33d49ae211e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-33",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.134",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-33.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.134"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.134",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-33-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.134"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
index 943f3357a09..bf01f61e158 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-34",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.135",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-34.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.135"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.135",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-34-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.135"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
index a2572ef714b..ac78d081de4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-35",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.136",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-35.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.136"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.136",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-35-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.136"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
index 07d246942f4..2d092cb8701 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-36",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.137",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-36.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.137"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.137",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-36-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.137"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
index 31d6fd9f561..11cc1903fbd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-37",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.138",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-37.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.138"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.138",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-37-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.138"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
index 6a73715c202..eda3a32175c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-38",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.139",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-38.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.139"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.139",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-38-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.139"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
index cd6ff6016f3..0fd23e93139 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-39",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.140",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-39.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.140"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.140",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-39-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.140"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
index 31b9ef690be..c3a7b4bc726 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-4",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.105",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-4.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.105"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.105",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-4-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.105"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
index 64c1c633d51..ba508985d0f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-40",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.141",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-40.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.141"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.141",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-40-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.141"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
index 2fc107d70ef..2e6eff56520 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-41",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.142",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-41.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.142"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.142",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-41-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.142"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
index 399b27887ac..1f2a8754338 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-42",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.143",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-42.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.143"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.143",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-42-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.143"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
index 1355131019f..46eec6ea199 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-43",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.144",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-43.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.144"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.144",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-43-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.144"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
index 553c461f4ab..e9df3e625d1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-44",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.145",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-44.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.145"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.145",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-44-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.145"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
index 136f6664fd4..6b7ba66dfd2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-45",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.146",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-45.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.146"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.146",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-45-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.146"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
index 9e982b7f5fe..08b83fb73c2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-46",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.147",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-46.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.147"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.147",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-46-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.147"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
index 756ba921b57..0064e36db4f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-47",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.148",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-47.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.148"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.148",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-47-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.148"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
index 9d4a55375e6..257f1656b9c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-48",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.149",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-48.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.149"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.149",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-48-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.149"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
index ab0bb8dbafc..ae28986129c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-49",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.150",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-49.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.150"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.150",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-49-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.150"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
index 60a193f6952..69a75ebbd99 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-5",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.106",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-5.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.106"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.106",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-5-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.106"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
index a871bcb34ee..7aa70eada11 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-50",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.151",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-50.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.151"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.151",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-50-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.151"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
index b09ce068305..0882d9618cc 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-51",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.152",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-51.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.152"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.152",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-51-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.152"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
index 8339823ad33..5981eaadb86 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-52",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.153",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-52.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.153"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.153",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-52-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.153"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
index 5058695f325..6bde2862d54 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-53",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.154",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-53.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.154"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.154",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-53-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.154"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
index 0eb4c4aa32b..1d0456840a3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-54",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.155",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-54.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.155"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.155",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-54-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.155"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
index fe3b953d067..efaecdb8b57 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-55",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.156",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-55.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.156"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.156",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-55-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.156"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
index 805e8e799f5..76eb7bde90c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-56",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.157",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-56.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.157"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.157",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-56-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.157"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
index d93879e83de..a4fde9563fa 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-57",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.158",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-57.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.158"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.158",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-57-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.158"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-57"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
index c9d8122c933..1af56e359b0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-58",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.159",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-58.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.159"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.159",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-58-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.159"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-58"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
index 665bc186624..56528138257 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-59",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.160",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-59.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.160"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.160",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-59-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.160"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-59"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
index 2f83067eec0..e5229aec955 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-6",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.107",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-6.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.107"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.107",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-6-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.107"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
index 40ce26c3aff..629c1c10665 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-60",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.161",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-60.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.161"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.161",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-60-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.161"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-60"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
index 665c1270da0..bf6868deb94 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-61",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.162",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-61.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.162"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.162",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-61-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.162"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-61"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
index 2c91387635a..550754c13d6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-62",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.163",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-62.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.163"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.163",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-62-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.163"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-62"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
index d8070219788..1fe755d6dcc 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-63",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.164",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-63.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.164"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.164",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-63-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.164"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-63"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
index 067747583c1..b3a42cc6330 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-64",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.165",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-64.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.165"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.165",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-64-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.165"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-64"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
index 74563c95dd8..75e23278daf 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-65",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.166",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-65.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.166"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.166",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-65-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.166"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-65"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
index ca925f1fc10..bc36a4495c9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-66",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.167",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-66.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.167"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.167",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-66-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.167"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-66"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
index 22c8d647628..144cac80a50 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-67",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.168",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-67.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.168"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.168",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-67-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.168"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-67"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
index 44f2e146713..78d7092c554 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-68",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.169",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-68.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.169"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.169",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-68-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.169"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-68"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
index bb4603cf71a..588c92dde49 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-69",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.170",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-69.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.170"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.170",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-69-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.170"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-69"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
index b4cfb729886..cf05245ca1a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-7",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.108",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-7.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.108"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.108",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-7-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.108"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
index 9b8097a439a..0fc0564a92c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-70",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.171",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-70.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.171"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.171",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-70-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.171"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-70"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
index f92016ca5f2..9b4f50e0cf1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-71",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.172",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-71.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.172"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.172",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-71-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.172"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-71"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
index dc91218d696..9f1438a7f67 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-72",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.173",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-72.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.173"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.173",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-72-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.173"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-72"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
index f384273b3a0..7768e4c295e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-73",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.174",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-73.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.174"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.174",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-73-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.174"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-73"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
index 81ebb6a0d1d..d6cd9f84952 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-74",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.175",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-74.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.175"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.175",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-74-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.175"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-74"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
index cad9f3ea330..de5042f75cd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-75",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.176",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-75.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.176"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.176",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-75-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.176"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-75"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
index 88e7389abb1..8552de2f754 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-76",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.177",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-76.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.177"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.177",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-76-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.177"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-76"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
index 1171acf7d71..a001c4920ce 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-77",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.178",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-77.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.178"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.178",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-77-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.178"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-77"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
index ba50db14c44..da62373a8b7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-78",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.179",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-78.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.179"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.179",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-78-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.179"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-78"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
index 14f7d85caa3..8080b0b51b6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-79",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.180",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-79.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.180"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.180",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-79-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.180"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-79"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
index ee8238ca7f6..c6b9832950b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-8",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.109",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-8.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.109"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.109",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-8-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.109"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
index 880be0d44e0..5a92c98043b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-80",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.181",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-80.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.181"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.181",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-80-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.181"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-80"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
index 04ebbbb2214..680f2a10bb6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-81",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.182",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-81.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.182"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.182",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-81-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.182"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-81"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
index b9074ee207c..2bfe3e5f779 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-82",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.183",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-82.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.183"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.183",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-82-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.183"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-82"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
index 158f6b52c46..3e421ba3d20 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-83",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.184",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-83.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.184"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.184",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-83-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.184"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-83"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
index c4ea054cf1e..6600f2b2d61 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-84",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.185",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-84.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.185"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.185",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-84-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.185"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-84"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
index 93f8c153c60..1ae2df403cb 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-85",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.186",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-85.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.186"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.186",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-85-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.186"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-85"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
index efb8b8156a2..7e6b7cbfb61 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-86",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.187",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-86.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.187"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.187",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-86-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.187"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-86"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
index e58d5d93669..cd461d1c7a3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-87",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.188",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-87.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.188"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.188",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-87-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.188"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-87"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
index 2986489cdb8..ac56365e3da 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-88",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.189",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-88.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.189"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.189",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-88-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.189"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-88"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
index bace805419f..5146358a7ab 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-89",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.190",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-89.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.190"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.190",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-89-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.190"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-89"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
index 5583224bf16..4d0ccf55e8d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-9",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.110",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-9.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.110"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.110",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-9-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.110"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
index a7412d05168..c77181c6d16 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-90",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.191",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-90.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.191"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.191",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-90-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.191"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-90"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
index e4147e621c3..a8dbf3bcfa7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-91",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.192",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-91.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.192"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.192",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-91-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.192"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-91"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
index 57425d9bd21..6ce0d2d258d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-92",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.193",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-92.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.193"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.193",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-92-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.193"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-92"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
index 721dc2812eb..7dd9c10cf6d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
@@ -1,78 +1,78 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "version": "HDS72168",
-      "driver": "sata_svw",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
-  "uid": "bordereau-93",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 1048576,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": null,
-    "kadeploy_name": "debian-x64-5-prod",
-    "name": "Debian Lenny",
-    "release": null,
-    "kadeploy_version": "1"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
     "smt_size": 4
   },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.194",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-93.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.194"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.194",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "tg3",
-      "version": "BCM5704",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "bordereau-93-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.194"
+      "vendor": "Broadcom",
+      "version": "BCM5704"
+    }
+  ],
+  "operating_system": {
+    "kadeploy_name": "debian-x64-5-prod",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 1048576,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
     }
   ],
   "supported_job_types": {
-    "deploy": true,
     "besteffort": true,
+    "deploy": true,
     "virtual": false
   },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "bordereau-93"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/borderline.json b/data/grid5000/sites/bordeaux/clusters/borderline/borderline.json
index 9527ee0e846..80849b0d64f 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/borderline.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/borderline.json
@@ -1,7 +1,7 @@
 {
-  "type": "cluster",
-  "model": "IBM System x3755",
-  "uid": "borderline",
   "created_at": "Mon, 01 Oct 2007 12:00:00 GMT",
-  "misc": "IPMI 2.0"
+  "misc": "IPMI 2.0",
+  "model": "IBM System x3755",
+  "type": "cluster",
+  "uid": "borderline"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
index 957ee3d3f35..22aa2db0e95 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
@@ -1,104 +1,104 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
-  "uid": "borderline-1",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "8218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": "3.1",
-    "name": "ClusterVision OS",
-    "release": "Boron"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
     "smt_size": 8
   },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.196",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.196"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.196",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-1-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.196"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "172.16.4.196",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "borderline-1-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "172.16.4.196"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "Myrinet",
+      "ip": "172.16.3.196",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "10G-PCIE-8A-C",
       "mounted": true,
-      "vendor": "Myrinet",
-      "management": false,
       "network_address": "borderline-1-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "myri0",
-      "ip": "172.16.3.196"
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    }
+  ],
+  "operating_system": {
+    "name": "ClusterVision OS",
+    "release": "Boron",
+    "version": "3.1"
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "8218"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
     }
   ],
   "supported_job_types": {
-    "deploy": false,
     "besteffort": true,
+    "deploy": false,
     "virtual": "amd-v"
   },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "borderline-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
index b947dc3bda6..1df349375d3 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
@@ -1,104 +1,104 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
-  "uid": "borderline-10",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "8218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": "3.1",
-    "name": "ClusterVision OS",
-    "release": "Boron"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
     "smt_size": 8
   },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.205",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-10.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.205"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.205",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-10-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.205"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "172.16.4.205",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "borderline-10-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "172.16.4.205"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "Myrinet",
+      "ip": "172.16.3.205",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "10G-PCIE-8A-C",
       "mounted": true,
-      "vendor": "Myrinet",
-      "management": false,
       "network_address": "borderline-10-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "myri0",
-      "ip": "172.16.3.205"
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    }
+  ],
+  "operating_system": {
+    "name": "ClusterVision OS",
+    "release": "Boron",
+    "version": "3.1"
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "8218"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
     }
   ],
   "supported_job_types": {
-    "deploy": false,
     "besteffort": true,
+    "deploy": false,
     "virtual": "amd-v"
   },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "borderline-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
index b5a18210190..fa37fcc5778 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
@@ -1,104 +1,104 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
-  "uid": "borderline-2",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "8218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": "3.1",
-    "name": "ClusterVision OS",
-    "release": "Boron"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
     "smt_size": 8
   },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.197",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-2.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.197"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.197",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-2-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.197"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "172.16.4.197",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "borderline-2-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "172.16.4.197"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "Myrinet",
+      "ip": "172.16.3.197",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "10G-PCIE-8A-C",
       "mounted": true,
-      "vendor": "Myrinet",
-      "management": false,
       "network_address": "borderline-2-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "myri0",
-      "ip": "172.16.3.197"
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    }
+  ],
+  "operating_system": {
+    "name": "ClusterVision OS",
+    "release": "Boron",
+    "version": "3.1"
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "8218"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
     }
   ],
   "supported_job_types": {
-    "deploy": false,
     "besteffort": true,
+    "deploy": false,
     "virtual": "amd-v"
   },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "borderline-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
index d1780540cf4..74e6007c2f4 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
@@ -1,104 +1,104 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
-  "uid": "borderline-3",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "8218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": "3.1",
-    "name": "ClusterVision OS",
-    "release": "Boron"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
     "smt_size": 8
   },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.198",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-3.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.198"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.198",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-3-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.198"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "172.16.4.198",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "borderline-3-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "172.16.4.198"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "Myrinet",
+      "ip": "172.16.3.198",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "10G-PCIE-8A-C",
       "mounted": true,
-      "vendor": "Myrinet",
-      "management": false,
       "network_address": "borderline-3-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "myri0",
-      "ip": "172.16.3.198"
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    }
+  ],
+  "operating_system": {
+    "name": "ClusterVision OS",
+    "release": "Boron",
+    "version": "3.1"
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "8218"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
     }
   ],
   "supported_job_types": {
-    "deploy": false,
     "besteffort": true,
+    "deploy": false,
     "virtual": "amd-v"
   },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "borderline-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
index 2b3f83279fd..16c936e9d1a 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
@@ -1,104 +1,104 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
-  "uid": "borderline-4",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "8218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": "3.1",
-    "name": "ClusterVision OS",
-    "release": "Boron"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
     "smt_size": 8
   },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.199",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-4.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.199"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.199",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-4-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.199"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "172.16.4.199",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "borderline-4-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "172.16.4.199"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "Myrinet",
+      "ip": "172.16.3.199",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "10G-PCIE-8A-C",
       "mounted": true,
-      "vendor": "Myrinet",
-      "management": false,
       "network_address": "borderline-4-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "myri0",
-      "ip": "172.16.3.199"
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    }
+  ],
+  "operating_system": {
+    "name": "ClusterVision OS",
+    "release": "Boron",
+    "version": "3.1"
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "8218"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
     }
   ],
   "supported_job_types": {
-    "deploy": false,
     "besteffort": true,
+    "deploy": false,
     "virtual": "amd-v"
   },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "borderline-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
index 493fdb32840..0f21cf0cefd 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
@@ -1,104 +1,104 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
-  "uid": "borderline-5",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "8218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": "3.1",
-    "name": "ClusterVision OS",
-    "release": "Boron"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
     "smt_size": 8
   },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.200",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-5.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.200"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.200",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-5-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.200"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "172.16.4.200",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "borderline-5-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "172.16.4.200"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "Myrinet",
+      "ip": "172.16.3.200",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "10G-PCIE-8A-C",
       "mounted": true,
-      "vendor": "Myrinet",
-      "management": false,
       "network_address": "borderline-5-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "myri0",
-      "ip": "172.16.3.200"
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    }
+  ],
+  "operating_system": {
+    "name": "ClusterVision OS",
+    "release": "Boron",
+    "version": "3.1"
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "8218"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
     }
   ],
   "supported_job_types": {
-    "deploy": false,
     "besteffort": true,
+    "deploy": false,
     "virtual": "amd-v"
   },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "borderline-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
index 1ec8beaf222..04e0cfe0c95 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
@@ -1,104 +1,104 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
-  "uid": "borderline-6",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "8218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": "3.1",
-    "name": "ClusterVision OS",
-    "release": "Boron"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
     "smt_size": 8
   },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.201",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-6.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.201"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.201",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-6-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.201"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "172.16.4.201",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "borderline-6-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "172.16.4.201"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "Myrinet",
+      "ip": "172.16.3.201",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "10G-PCIE-8A-C",
       "mounted": true,
-      "vendor": "Myrinet",
-      "management": false,
       "network_address": "borderline-6-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "myri0",
-      "ip": "172.16.3.201"
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    }
+  ],
+  "operating_system": {
+    "name": "ClusterVision OS",
+    "release": "Boron",
+    "version": "3.1"
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "8218"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
     }
   ],
   "supported_job_types": {
-    "deploy": false,
     "besteffort": true,
+    "deploy": false,
     "virtual": "amd-v"
   },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "borderline-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
index 987bc986a8b..e9f1ea4cc8c 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
@@ -1,104 +1,104 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
-  "uid": "borderline-7",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "8218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": "3.1",
-    "name": "ClusterVision OS",
-    "release": "Boron"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
     "smt_size": 8
   },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.202",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-7.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.202"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.202",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-7-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.202"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "172.16.4.202",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "borderline-7-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "172.16.4.202"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "Myrinet",
+      "ip": "172.16.3.202",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "10G-PCIE-8A-C",
       "mounted": true,
-      "vendor": "Myrinet",
-      "management": false,
       "network_address": "borderline-7-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "myri0",
-      "ip": "172.16.3.202"
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    }
+  ],
+  "operating_system": {
+    "name": "ClusterVision OS",
+    "release": "Boron",
+    "version": "3.1"
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "8218"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
     }
   ],
   "supported_job_types": {
-    "deploy": false,
     "besteffort": true,
+    "deploy": false,
     "virtual": "amd-v"
   },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "borderline-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
index f19515746e2..52e1a571c03 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
@@ -1,104 +1,104 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
-  "uid": "borderline-8",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "8218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": "3.1",
-    "name": "ClusterVision OS",
-    "release": "Boron"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
     "smt_size": 8
   },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.203",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-8.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.203"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.203",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-8-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.203"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "172.16.4.203",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "borderline-8-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "172.16.4.203"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "Myrinet",
+      "ip": "172.16.3.203",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "10G-PCIE-8A-C",
       "mounted": true,
-      "vendor": "Myrinet",
-      "management": false,
       "network_address": "borderline-8-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "myri0",
-      "ip": "172.16.3.203"
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    }
+  ],
+  "operating_system": {
+    "name": "ClusterVision OS",
+    "release": "Boron",
+    "version": "3.1"
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "8218"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
     }
   ],
   "supported_job_types": {
-    "deploy": false,
     "besteffort": true,
+    "deploy": false,
     "virtual": "amd-v"
   },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "borderline-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
index 15320af224f..5e2f47cbcc4 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
@@ -1,104 +1,104 @@
 {
-  "type": "node",
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
-  "uid": "borderline-9",
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": 65536,
-    "version": "8218",
-    "vendor": "AMD",
-    "cache_l1d": 65536,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152,
-    "instruction_set": "x86-64"
-  },
-  "operating_system": {
-    "version": "3.1",
-    "name": "ClusterVision OS",
-    "release": "Boron"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
     "smt_size": 8
   },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
+  },
   "network_adapters": [
     {
-      "mac": "",
+      "device": "eth0",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.1.204",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": true,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-9.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "ip": "172.16.1.204"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "eth1",
+      "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.204",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "bnx2",
-      "version": "NetXtreme II BCM5708",
       "mounted": false,
-      "vendor": "Broadcom",
-      "management": false,
       "network_address": "borderline-9-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth1",
-      "ip": "192.168.133.204"
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "mac": "",
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "InfiniBand",
+      "ip": "172.16.4.204",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "InfiniHost MT25208",
       "mounted": true,
-      "vendor": "Mellanox",
-      "management": false,
       "network_address": "borderline-9-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "ib0",
-      "ip": "172.16.4.204"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
     },
     {
-      "mac": "",
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
       "interface": "Myrinet",
+      "ip": "172.16.3.204",
+      "mac": "",
+      "management": false,
       "mountable": true,
-      "driver": "ib_mthca",
-      "version": "10G-PCIE-8A-C",
       "mounted": true,
-      "vendor": "Myrinet",
-      "management": false,
       "network_address": "borderline-9-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "device": "myri0",
-      "ip": "172.16.3.204"
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    }
+  ],
+  "operating_system": {
+    "name": "ClusterVision OS",
+    "release": "Boron",
+    "version": "3.1"
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 65536,
+    "cache_l1i": 65536,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "x86-64",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "8218"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
     }
   ],
   "supported_job_types": {
-    "deploy": false,
     "besteffort": true,
+    "deploy": false,
     "virtual": "amd-v"
   },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
-  }
+  "type": "node",
+  "uid": "borderline-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/adonis.json b/data/grid5000/sites/grenoble/clusters/adonis/adonis.json
index 43ec4fb1653..9655b3419ba 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/adonis.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/adonis.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
-  "uid": "adonis",
+  "created_at": "Wed, 01 Sep 2010 22:00:00 GMT",
   "model": "Bull R425-E2 4U + Tesla C2050",
-  "created_at": "Wed, 01 Sep 2010 22:00:00 GMT"
+  "type": "cluster",
+  "uid": "adonis"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
index 8a55b5a1d4a..b6fac7f30ad 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "adonis-1",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,66 +13,80 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.131",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-1.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.131",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:cc:7f:d8",
       "enabled": true,
       "interface": "Ethernet",
-      "version": "Device 10c9 (rev 01)",
+      "ip": "172.16.16.131",
+      "mac": "00:30:48:cc:7f:d8",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-1-eth0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 1000000000,
-      "ip": "172.16.16.131",
-      "vendor": "Intel"
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:cc:7f:d9",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cc:7f:d9",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "00:30:48:cc:b0:58",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.131",
+      "mac": "00:30:48:cc:b0:58",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-1-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.2.131"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
index d656997ba3f..36b6e0a5657 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "adonis-10",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,66 +13,80 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.140",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-10.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.140",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:cc:83:10",
       "enabled": true,
       "interface": "Ethernet",
-      "version": "Device 10c9 (rev 01)",
+      "ip": "172.16.16.140",
+      "mac": "00:30:48:cc:83:10",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-10-eth0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 1000000000,
-      "ip": "172.16.16.140",
-      "vendor": "Intel"
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:cc:83:11",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cc:83:11",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "00:30:48:cc:ad:df",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.140",
+      "mac": "00:30:48:cc:ad:df",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-10-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.2.140"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
index e4eac434679..85f14f6c29f 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "adonis-11",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,45 +13,59 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.141",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-11.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.141",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:da:6f:66",
       "enabled": true,
       "interface": "Ethernet",
-      "version": "Device 10c9 (rev 01)",
+      "ip": "172.16.16.141",
+      "mac": "00:30:48:da:6f:66",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-11-eth0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 1000000000,
-      "ip": "172.16.16.141",
-      "vendor": "Intel"
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "version": "E5620",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
index 0e0c258f6fc..664281ae2b7 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "adonis-12",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,45 +13,59 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.142",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-12.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.142",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "00:25:90:01:eb:fc",
       "enabled": true,
       "interface": "Ethernet",
-      "version": "Device 10c9 (rev 01)",
+      "ip": "172.16.16.142",
+      "mac": "00:25:90:01:eb:fc",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-12-eth0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 1000000000,
-      "ip": "172.16.16.142",
-      "vendor": "Intel"
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "version": "E5620",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
index 4a466917add..1db77be7dd0 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "adonis-2",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,66 +13,80 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.132",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-2.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.132",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:cc:7f:da",
       "enabled": true,
       "interface": "Ethernet",
-      "version": "Device 10c9 (rev 01)",
+      "ip": "172.16.16.132",
+      "mac": "00:30:48:cc:7f:da",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-2-eth0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 1000000000,
-      "ip": "172.16.16.132",
-      "vendor": "Intel"
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:cc:7f:db",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cc:7f:db",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "00:30:48:cc:b0:59",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.132",
+      "mac": "00:30:48:cc:b0:59",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-2-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.2.132"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
index 54eefc1b303..a69c1b4f7fe 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "adonis-3",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,66 +13,80 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.133",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-3.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.133",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:cd:c6:a4",
       "enabled": true,
       "interface": "Ethernet",
-      "version": "Device 10c9 (rev 01)",
+      "ip": "172.16.16.133",
+      "mac": "00:30:48:cd:c6:a4",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-3-eth0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 1000000000,
-      "ip": "172.16.16.133",
-      "vendor": "Intel"
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:cd:c6:a5",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cd:c6:a5",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "00:30:48:cc:b5:f6",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.133",
+      "mac": "00:30:48:cc:b5:f6",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-3-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.2.133"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
index b83524f59ab..55f139e23a9 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "adonis-4",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,66 +13,80 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.134",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-4.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.134",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:cd:c0:ac",
       "enabled": true,
       "interface": "Ethernet",
-      "version": "Device 10c9 (rev 01)",
+      "ip": "172.16.16.134",
+      "mac": "00:30:48:cd:c0:ac",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-4-eth0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 1000000000,
-      "ip": "172.16.16.134",
-      "vendor": "Intel"
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:cd:c0:ad",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cd:c0:ad",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "00:30:48:cc:b6:6c",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.134",
+      "mac": "00:30:48:cc:b6:6c",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-4-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.2.134"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
index ed78749143a..79071af3c9b 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "adonis-5",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,66 +13,80 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.135",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-5.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.135",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:cc:7e:0a",
       "enabled": true,
       "interface": "Ethernet",
-      "version": "Device 10c9 (rev 01)",
+      "ip": "172.16.16.135",
+      "mac": "00:30:48:cc:7e:0a",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-5-eth0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 1000000000,
-      "ip": "172.16.16.135",
-      "vendor": "Intel"
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:cc:7e:0b",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cc:7e:0b",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "00:30:48:cc:af:61",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.135",
+      "mac": "00:30:48:cc:af:61",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-5-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.2.135"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
index 63d12ce5976..925e84ee039 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "adonis-6",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,66 +13,80 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.136",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-6.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.136",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:cc:7a:bc",
       "enabled": true,
       "interface": "Ethernet",
-      "version": "Device 10c9 (rev 01)",
+      "ip": "172.16.16.136",
+      "mac": "00:30:48:cc:7a:bc",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-6-eth0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 1000000000,
-      "ip": "172.16.16.136",
-      "vendor": "Intel"
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:cc:7a:bd",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cc:7a:bd",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "00:30:48:cc:ad:f2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.136",
+      "mac": "00:30:48:cc:ad:f2",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-6-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.2.136"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
index 4961a29ad4a..0f89f84d3d3 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "adonis-7",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,66 +13,80 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.137",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-7.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.137",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:cd:c6:80",
       "enabled": true,
       "interface": "Ethernet",
-      "version": "Device 10c9 (rev 01)",
+      "ip": "172.16.16.137",
+      "mac": "00:30:48:cd:c6:80",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-7-eth0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 1000000000,
-      "ip": "172.16.16.137",
-      "vendor": "Intel"
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:cd:c6:81",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cd:c6:81",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "00:30:48:cc:b5:e4",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.137",
+      "mac": "00:30:48:cc:b5:e4",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-7-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.2.137"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
index f847f987d50..e0a1c606f8d 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "adonis-8",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,66 +13,80 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.138",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-8.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.138",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:cd:c0:ae",
       "enabled": true,
       "interface": "Ethernet",
-      "version": "Device 10c9 (rev 01)",
+      "ip": "172.16.16.138",
+      "mac": "00:30:48:cd:c0:ae",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-8-eth0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 1000000000,
-      "ip": "172.16.16.138",
-      "vendor": "Intel"
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:cd:c0:af",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cd:c0:af",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "00:30:48:cc:b6:6d",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.138",
+      "mac": "00:30:48:cc:b6:6d",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-8-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.2.138"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
index 6f2c627742f..5bfb8195237 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "adonis-9",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,66 +13,80 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.139",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-9.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.139",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:cb:cf:7e",
       "enabled": true,
       "interface": "Ethernet",
-      "version": "Device 10c9 (rev 01)",
+      "ip": "172.16.16.139",
+      "mac": "00:30:48:cb:cf:7e",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-9-eth0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 1000000000,
-      "ip": "172.16.16.139",
-      "vendor": "Intel"
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:cb:cf:7f",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cb:cf:7f",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "00:30:48:cc:ac:d1",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.139",
+      "mac": "00:30:48:cc:ac:d1",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-9-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.2.139"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "adonis-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/edel.json b/data/grid5000/sites/grenoble/clusters/edel/edel.json
index 5514489f866..40978e861be 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/edel.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/edel.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
-  "uid": "edel",
+  "created_at": "Thu, 02 Oct 2008 22:00:00 GMT",
   "model": "Bull bullx B500 compute blades",
-  "created_at": "Thu, 02 Oct 2008 22:00:00 GMT"
+  "type": "cluster",
+  "uid": "edel"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
index 200b2c7d857..5d06d862ad4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-1",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.51",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-1.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.51",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": null,
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.51",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-1-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.51"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": null,
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.51",
+      "mac": null,
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-1-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.51"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
index 02f3ad8b5a9..bd97dba84f3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-10",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.60",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-10.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.60",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:94",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.60",
+      "mac": "08:00:38:35:ab:94",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-10-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.60"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.60",
+      "mac": "",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-10-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.60"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
index 6e6ad64153e..b2588144b39 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-11",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.61",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-11.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.61",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:90",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.61",
+      "mac": "08:00:38:35:ab:90",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-11-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.61"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.61",
+      "mac": "",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-11-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.61"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
index ea7e17b0376..f01762be2ac 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-12",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.62",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-12.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.62",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:3c",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.62",
+      "mac": "08:00:38:35:ac:3c",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-12-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.62"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:1e",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.62",
+      "mac": "08:00:38:35:a4:1e",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-12-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.62"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
index 5810ee42b73..358e39ceb09 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-13",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.63",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-13.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.63",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:dc",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.63",
+      "mac": "08:00:38:35:ab:dc",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-13-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.63"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:ee",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.63",
+      "mac": "08:00:38:35:a3:ee",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-13-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.63"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
index 18a828316d1..3f4d12a00ba 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-14",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.64",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-14.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.64",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:ac",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.64",
+      "mac": "08:00:38:35:ab:ac",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-14-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.64"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:d6",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.64",
+      "mac": "08:00:38:35:a3:d6",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-14-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.64"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
index 268290d6916..6af64c79664 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-15",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.65",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-15.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.65",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:fc",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.65",
+      "mac": "08:00:38:35:ab:fc",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-15-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.65"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:fe",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.65",
+      "mac": "08:00:38:35:a3:fe",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-15-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.65"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
index 9cb2269046a..f3cefff6a58 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-16",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.66",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-16.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.66",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:0c",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.66",
+      "mac": "08:00:38:35:ac:0c",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-16-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.66"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:06",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.66",
+      "mac": "08:00:38:35:a4:06",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-16-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.66"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
index c264a367f12..3a4583ceb02 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-17",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.67",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-17.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.67",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:9e",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.67",
+      "mac": "08:00:38:35:ab:9e",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-17-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.67"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:cf",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.67",
+      "mac": "08:00:38:35:a3:cf",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-17-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.67"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
index 8f980e3df4e..38da5373a54 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-18",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.68",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-18.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.68",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:82",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.68",
+      "mac": "08:00:38:35:ab:82",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-18-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.68"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:c1",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.68",
+      "mac": "08:00:38:35:a3:c1",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-18-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.68"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
index 3da99498908..b2cf303ae8d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-19",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.69",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-19.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.69",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:d0",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.69",
+      "mac": "08:00:38:35:ab:d0",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-19-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.69"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:e8",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.69",
+      "mac": "08:00:38:35:a3:e8",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-19-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.69"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
index c5ea5dc46e8..086e540fdd4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-2",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.52",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-2.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.52",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": null,
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.52",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-2-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.52"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": null,
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.52",
+      "mac": null,
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-2-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.52"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
index 40b654a94a8..c1b09b88821 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-20",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.70",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-20.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.70",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:78",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.70",
+      "mac": "08:00:38:35:ab:78",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-20-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.70"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:bc",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.70",
+      "mac": "08:00:38:35:a3:bc",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-20-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.70"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
index 6041a81cf23..18235485e67 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-21",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.71",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-21.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.71",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:4a",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.71",
+      "mac": "08:00:38:35:ac:4a",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-21-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.71"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:25",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.71",
+      "mac": "08:00:38:35:a4:25",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-21-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.71"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
index fbf2bc729b8..4c160efcfe9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-22",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.72",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-22.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.72",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:9c",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.72",
+      "mac": "08:00:38:35:ab:9c",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-22-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.72"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:ce",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.72",
+      "mac": "08:00:38:35:a3:ce",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-22-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.72"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
index adfb3e7461a..30950aef913 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-23",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.73",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-23.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.73",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:d6",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.73",
+      "mac": "08:00:38:35:ab:d6",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-23-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.73"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:eb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.73",
+      "mac": "08:00:38:35:a3:eb",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-23-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.73"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
index 134626f977c..ffff58c0dbb 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-24",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.74",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-24.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.74",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:26",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.74",
+      "mac": "08:00:38:35:ac:26",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-24-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.74"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.74",
+      "mac": "",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-24-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.74"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
index fc49f4670a5..9998af5ff97 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-25",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.75",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-25.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.75",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:aa:b8",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.75",
+      "mac": "08:00:38:35:aa:b8",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-25-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.75"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:5c",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.75",
+      "mac": "08:00:38:35:a3:5c",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-25-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.75"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
index e0db4dc49c4..c0a3e025f43 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-26",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.76",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-26.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.76",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:54",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.76",
+      "mac": "08:00:38:35:ab:54",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-26-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.76"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.76",
+      "mac": "",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-26-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.76"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
index b2288b381fc..bf60d7281a4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-27",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.77",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-27.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.77",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:3e",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.77",
+      "mac": "08:00:38:35:ac:3e",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-27-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.77"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:1f",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.77",
+      "mac": "08:00:38:35:a4:1f",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-27-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.77"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
index ed6a9e88d78..852c33b3956 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-28",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.78",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-28.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.78",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:48",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.78",
+      "mac": "08:00:38:35:ac:48",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-28-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.78"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:24",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.78",
+      "mac": "08:00:38:35:a4:24",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-28-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.78"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
index e04c5bfef90..3e04f7cddf3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-29",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.79",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-29.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.79",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:be",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.79",
+      "mac": "08:00:38:35:ab:be",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-29-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.79"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:df",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.79",
+      "mac": "08:00:38:35:a3:df",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-29-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.79"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
index 879c44f928e..291e09fb6a9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-3",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.53",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-3.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.53",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:8c",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.53",
+      "mac": "08:00:38:35:ab:8c",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-3-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.53"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:c6",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.53",
+      "mac": "08:00:38:35:a3:c6",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-3-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.53"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
index db0aa8db672..64b186e8957 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-30",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.80",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-30.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.80",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:ba",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.80",
+      "mac": "08:00:38:35:ab:ba",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-30-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.80"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:dd",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.80",
+      "mac": "08:00:38:35:a3:dd",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-30-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.80"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
index 55140a99bcb..843cd19342c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-31",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.81",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-31.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.81",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:af:3e",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.81",
+      "mac": "08:00:38:35:af:3e",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-31-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.81"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a5:9f",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.81",
+      "mac": "08:00:38:35:a5:9f",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-31-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.81"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
index 5a9134a8ca7..54b63008884 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-32",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.82",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-32.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.82",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:46",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.82",
+      "mac": "08:00:38:35:ab:46",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-32-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.82"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:a3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.82",
+      "mac": "08:00:38:35:a3:a3",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-32-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.82"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
index 40ffa39e3ff..657cee13e2d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-33",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.83",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-33.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.83",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:4c",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.83",
+      "mac": "08:00:38:35:ac:4c",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-33-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.83"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:26",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.83",
+      "mac": "08:00:38:35:a4:26",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-33-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.83"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
index f38e2833108..62d4f1933a4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-34",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.84",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-34.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.84",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:a2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.84",
+      "mac": "08:00:38:35:ab:a2",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-34-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.84"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:d1",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.84",
+      "mac": "08:00:38:35:a3:d1",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-34-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.84"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
index 20eeab8d1af..457ef4217b7 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-35",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.85",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-35.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.85",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:62",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.85",
+      "mac": "08:00:38:35:ab:62",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-35-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.85"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:b1",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.85",
+      "mac": "08:00:38:35:a3:b1",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-35-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.85"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
index 3f2d66ae450..62cf88fd18b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-36",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.86",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-36.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.86",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:e6",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.86",
+      "mac": "08:00:38:35:ab:e6",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-36-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.86"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:f3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.86",
+      "mac": "08:00:38:35:a3:f3",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-36-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.86"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
index 71e5403eeec..7385fd6702d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-37",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.87",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-37.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.87",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:aa:64",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.87",
+      "mac": "08:00:38:35:aa:64",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-37-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.87"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:32",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.87",
+      "mac": "08:00:38:35:a3:32",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-37-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.87"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
index c6e2c1f4d12..55b5b03fa43 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-38",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.88",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-38.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.88",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:d2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.88",
+      "mac": "08:00:38:35:ab:d2",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-38-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.88"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:e9",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.88",
+      "mac": "08:00:38:35:a3:e9",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-38-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.88"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
index 96169c1d37a..7471980f0a8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-39",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.89",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-39.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.89",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:2a",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.89",
+      "mac": "08:00:38:35:ac:2a",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-39-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.89"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:15",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.89",
+      "mac": "08:00:38:35:a4:15",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-39-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.89"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
index 78b661f7d47..045331aef1f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-4",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.54",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-4.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.54",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": null,
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.54",
+      "mac": null,
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-4-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.54"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": null,
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.54",
+      "mac": null,
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-4-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.54"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
index d6761e5e084..c01a994e6b6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-40",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.90",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-40.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.90",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:a8",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.90",
+      "mac": "08:00:38:35:ab:a8",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-40-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.90"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:d4",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.90",
+      "mac": "08:00:38:35:a3:d4",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-40-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.90"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
index bb18a66a0e7..90e6f6712bd 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-41",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.91",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-41.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.91",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:36",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.91",
+      "mac": "08:00:38:35:ac:36",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-41-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.91"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:1b",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.91",
+      "mac": "08:00:38:35:a4:1b",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-41-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.91"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
index 6d76398707b..747f2e21fb9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-42",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.92",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-42.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.92",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ad:be",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.92",
+      "mac": "08:00:38:35:ad:be",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-42-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.92"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.92",
+      "mac": "",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-42-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.92"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
index a652a83f0b6..cb8c92e1ae2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-43",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.93",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-43.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.93",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:d4",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.93",
+      "mac": "08:00:38:35:ab:d4",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-43-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.93"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:ea",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.93",
+      "mac": "08:00:38:35:a3:ea",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-43-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.93"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
index a4f67215764..6ee0225254a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-44",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.94",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-44.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.94",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:aa",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.94",
+      "mac": "08:00:38:35:ab:aa",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-44-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.94"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:d5",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.94",
+      "mac": "08:00:38:35:a3:d5",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-44-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.94"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
index 7a1c63e9614..7ecf032da46 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-45",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.95",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-45.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.95",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:22",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.95",
+      "mac": "08:00:38:35:ac:22",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-45-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.95"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:11",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.95",
+      "mac": "08:00:38:35:a4:11",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-45-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.95"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
index 7aaf76a78ff..63a1befa499 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-46",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.96",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-46.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.96",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:4a",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.96",
+      "mac": "08:00:38:35:ab:4a",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-46-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.96"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:a5",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.96",
+      "mac": "08:00:38:35:a3:a5",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-46-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.96"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
index 8900b99d114..eb366063c85 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-47",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.97",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-47.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.97",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:bc",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.97",
+      "mac": "08:00:38:35:ab:bc",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-47-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.97"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:de",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.97",
+      "mac": "08:00:38:35:a3:de",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-47-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.97"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
index 06f04a68150..842c053eaec 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-48",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.98",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-48.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.98",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:70",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.98",
+      "mac": "08:00:38:35:ab:70",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-48-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.98"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:b8",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.98",
+      "mac": "08:00:38:35:a3:b8",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-48-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.98"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
index ea741dd289f..f6d73d04ccb 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-49",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.99",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-49.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.99",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:b6",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.99",
+      "mac": "08:00:38:35:ab:b6",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-49-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.99"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:db",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.99",
+      "mac": "08:00:38:35:a3:db",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-49-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.99"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
index db6ea8821a3..f7808c14a08 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-5",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.55",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-5.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.55",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:92",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.55",
+      "mac": "08:00:38:35:ab:92",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-5-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.55"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:c9",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.55",
+      "mac": "08:00:38:35:a3:c9",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-5-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.55"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
index 4b082e29406..39d9b301878 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-50",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.100",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-50.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.100",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:10",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.100",
+      "mac": "08:00:38:35:ac:10",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-50-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.100"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.100",
+      "mac": "",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-50-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.100"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
index 5c26085d6ea..bb4bea46006 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-51",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.101",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-51.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.101",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:40",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.101",
+      "mac": "08:00:38:35:ac:40",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-51-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.101"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:20",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.101",
+      "mac": "08:00:38:35:a4:20",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-51-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.101"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
index 9e6abc02b07..b3a27602905 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-52",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.102",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-52.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.102",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:1a",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.102",
+      "mac": "08:00:38:35:ac:1a",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-52-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.102"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:0d",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.102",
+      "mac": "08:00:38:35:a4:0d",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-52-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.102"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
index f703f035480..3f61ffd2179 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-53",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.103",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-53.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.103",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:34",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.103",
+      "mac": "08:00:38:35:ac:34",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-53-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.103"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:1a",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.103",
+      "mac": "08:00:38:35:a4:1a",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-53-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.103"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
index cc408702468..c8d3ec64d1f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-54",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.104",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-54.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.104",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:3a",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.104",
+      "mac": "08:00:38:35:ac:3a",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-54-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.104"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:1d",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.104",
+      "mac": "08:00:38:35:a4:1d",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-54-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.104"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
index 919e846c255..c4471177029 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-55",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.105",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-55.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.105",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:e8",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.105",
+      "mac": "08:00:38:35:ab:e8",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-55-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.105"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:f4",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.105",
+      "mac": "08:00:38:35:a3:f4",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-55-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.105"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
index 82726ed7b91..ae0e096fe99 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-56",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.106",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-56.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.106",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:00",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.106",
+      "mac": "08:00:38:35:ac:00",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-56-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.106"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:00",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.106",
+      "mac": "08:00:38:35:a4:00",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-56-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.106"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
index 7ec0f66ebb9..2cf53cbca22 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-57",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.107",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-57.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.107",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:ae",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.107",
+      "mac": "08:00:38:35:ab:ae",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-57-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.107"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:d7",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.107",
+      "mac": "08:00:38:35:a3:d7",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-57-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.107"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-57"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
index ce63b54af99..2055de31e4a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-58",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.108",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-58.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.108",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:08",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.108",
+      "mac": "08:00:38:35:ac:08",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-58-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.108"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:04",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.108",
+      "mac": "08:00:38:35:a4:04",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-58-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.108"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-58"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
index 0270a1737bc..2ccb4fd87d3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-59",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.109",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-59.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.109",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:5a",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.109",
+      "mac": "08:00:38:35:ab:5a",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-59-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.109"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:ad",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.109",
+      "mac": "08:00:38:35:a3:ad",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-59-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.109"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-59"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
index 5ad180d7cf2..b11c8b98ea4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-6",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.56",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-6.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.56",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:54",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.56",
+      "mac": "08:00:38:35:ac:54",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-6-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.56"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:2a",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.56",
+      "mac": "08:00:38:35:a4:2a",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-6-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.56"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
index 740b2e272c5..efd5e9da52c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-60",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.110",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-60.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.110",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:24",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.110",
+      "mac": "08:00:38:35:ac:24",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-60-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.110"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:12",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.110",
+      "mac": "08:00:38:35:a4:12",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-60-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.110"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-60"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
index 9d3e8b0cc36..adc8b870411 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-61",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.111",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-61.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.111",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:5c",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.111",
+      "mac": "08:00:38:35:ab:5c",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-61-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.111"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:ae",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.111",
+      "mac": "08:00:38:35:a3:ae",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-61-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.111"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-61"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
index 8f8fd17b6eb..89fdab93723 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-62",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.112",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-62.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.112",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:da",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.112",
+      "mac": "08:00:38:35:ab:da",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-62-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.112"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:ed",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.112",
+      "mac": "08:00:38:35:a3:ed",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-62-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.112"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-62"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
index f8dcd3b986e..ec97ac6f5f0 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-63",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.113",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-63.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.113",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:b2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.113",
+      "mac": "08:00:38:35:ab:b2",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-63-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.113"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:d9",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.113",
+      "mac": "08:00:38:35:a3:d9",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-63-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.113"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-63"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
index 38937362ba9..8b359b76084 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-64",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.114",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-64.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.114",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:aa:20",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.114",
+      "mac": "08:00:38:35:aa:20",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-64-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.114"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:10",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.114",
+      "mac": "08:00:38:35:a3:10",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-64-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.114"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-64"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
index 525d3cf4b30..650b37b8200 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-65",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.115",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-65.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.115",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:e4",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.115",
+      "mac": "08:00:38:35:ab:e4",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-65-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.115"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.115",
+      "mac": "",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-65-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.115"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-65"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
index c70fdd180ca..2e35d92c1d7 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-66",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.116",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-66.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.116",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:14",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.116",
+      "mac": "08:00:38:35:ac:14",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-66-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.116"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:0a",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.116",
+      "mac": "08:00:38:35:a4:0a",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-66-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.116"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-66"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
index ecf04255dbc..dbf32d7d32f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-67",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.117",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-67.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.117",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:fa",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.117",
+      "mac": "08:00:38:35:ab:fa",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-67-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.117"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:fd",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.117",
+      "mac": "08:00:38:35:a3:fd",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-67-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.117"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-67"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
index fb8a24667f2..1a7f10e2967 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-68",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.118",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-68.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.118",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:b0",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.118",
+      "mac": "08:00:38:35:ab:b0",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-68-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.118"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:d8",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.118",
+      "mac": "08:00:38:35:a3:d8",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-68-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.118"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-68"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
index 8c1df229947..db050b51575 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-69",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.119",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-69.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.119",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:68",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.119",
+      "mac": "08:00:38:35:ac:68",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-69-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.119"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.119",
+      "mac": "",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-69-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.119"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-69"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
index 920ee40580e..84cf1a0125d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-7",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.57",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-7.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.57",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:40",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.57",
+      "mac": "08:00:38:35:ab:40",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-7-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.57"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:a0",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.57",
+      "mac": "08:00:38:35:a3:a0",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-7-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.57"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
index dca10a4bafe..763edeae606 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-70",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.120",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-70.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.120",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ac:66",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.120",
+      "mac": "08:00:38:35:ac:66",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-70-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.120"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a4:33",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.120",
+      "mac": "08:00:38:35:a4:33",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-70-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.120"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-70"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
index d6d601779e3..134c0ebbd9e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-71",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.121",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-71.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.121",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:66",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.121",
+      "mac": "08:00:38:35:ab:66",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-71-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.121"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.121",
+      "mac": "",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-71-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.121"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-71"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
index 0a2909ee9e5..9ee0991e23a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-72",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.122",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-72.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.122",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:50",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.122",
+      "mac": "08:00:38:35:ab:50",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-72-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.122"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:a8",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.122",
+      "mac": "08:00:38:35:a3:a8",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-72-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.122"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-72"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
index b20a87b1b1e..6b6d58964b3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-8",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.58",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-8.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.58",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:56",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.58",
+      "mac": "08:00:38:35:ab:56",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-8-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.58"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:ab",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.58",
+      "mac": "08:00:38:35:a3:ab",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-8-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.58"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
index d44f1797802..088c22e318b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 55879354476.9287
-    }
-  ],
-  "uid": "edel-9",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "false"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 25769803776,
@@ -27,62 +13,76 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+      "ip": "172.16.18.59",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-9.grenoble.grid5000.fr",
-      "management": false,
       "rate": 40000000000,
-      "ip": "172.16.18.59",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
     },
     {
       "device": "eth0",
-      "mac": "08:00:38:35:ab:d8",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.59",
+      "mac": "08:00:38:35:ab:d8",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-9-eth0.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.59"
+      "rate": 1000000000
     },
     {
       "enabled": false,
       "interface": "Ethernet",
+      "management": false,
       "mountable": false,
       "mounted": false,
-      "management": false,
       "rate": 1000000000
     },
     {
-      "mac": "08:00:38:35:a3:ec",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.2.59",
+      "mac": "08:00:38:35:a3:ec",
+      "management": true,
       "mountable": false,
       "mounted": false,
       "network_address": "edel-9-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 100000000,
-      "ip": "192.168.2.59"
+      "rate": 100000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2270000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2270000000.0,
     "instruction_set": "",
-    "version": "E5520",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5520"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 55879354476.9287
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "false"
+  },
+  "type": "node",
+  "uid": "edel-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/genepi.json b/data/grid5000/sites/grenoble/clusters/genepi/genepi.json
index af7f0029e4b..d230a1da4cd 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/genepi.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/genepi.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
-  "uid": "genepi",
+  "created_at": "Tue, 30 Sep 2008 22:00:00 GMT",
   "model": "Bull R422-E1",
-  "created_at": "Tue, 30 Sep 2008 22:00:00 GMT"
+  "type": "cluster",
+  "uid": "genepi"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
index 50c59567e87..f4c7a4c7126 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-1",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.1",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-1-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.1",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:85:be",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:85:be",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:85:bf",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.1",
+      "mac": "00:30:48:7f:85:bf",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-1.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.1"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d6:b5",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.101",
+      "mac": "00:30:48:96:d6:b5",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-1-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.101"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
index 41c42cdc5ca..6728bb1124c 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-10",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.10",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-10-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.10",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:41:fc",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:41:fc",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:41:fd",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.10",
+      "mac": "00:30:48:7f:41:fd",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-10.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.10"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d4:2d",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.110",
+      "mac": "00:30:48:96:d4:2d",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-10-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.110"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
index 93264fa66bd..3114b639595 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-11",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.11",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-11-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.11",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:42:06",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:42:06",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:42:07",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.11",
+      "mac": "00:30:48:7f:42:07",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-11.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.11"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d6:90",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.111",
+      "mac": "00:30:48:96:d6:90",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-11-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.111"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
index 3f801166b73..ca9a982ea98 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-12",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.12",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-12-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.12",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7e:a3:d4",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7e:a3:d4",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7e:a3:d5",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.12",
+      "mac": "00:30:48:7e:a3:d5",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-12.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.12"
+      "rate": 1000000000
     },
     {
-      "mac": "",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.112",
+      "mac": "",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-12-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.112"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
index a8770ad4d18..3acb0ac4efd 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-13",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.13",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-13-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.13",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:3e:c6",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:3e:c6",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:3e:c7",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.13",
+      "mac": "00:30:48:7f:3e:c7",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-13.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.13"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d4:9a",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.113",
+      "mac": "00:30:48:96:d4:9a",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-13-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.113"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
index d3434e046e2..0aeccc97df7 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-14",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.14",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-14-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.14",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:41:f2",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:41:f2",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:41:f3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.14",
+      "mac": "00:30:48:7f:41:f3",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-14.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.14"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d3:40",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.114",
+      "mac": "00:30:48:96:d3:40",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-14-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.114"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
index 900c4777d9f..5fd8f248103 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-15",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.15",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-15-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.15",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:3e:f2",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:3e:f2",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:3e:f3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.15",
+      "mac": "00:30:48:7f:3e:f3",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-15.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.15"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d3:2f",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.115",
+      "mac": "00:30:48:96:d3:2f",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-15-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.115"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
index d2e9a155586..f252a1d2972 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-16",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.16",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-16-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.16",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:3e:b8",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:3e:b8",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:3e:b9",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.16",
+      "mac": "00:30:48:7f:3e:b9",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-16.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.16"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d4:37",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.116",
+      "mac": "00:30:48:96:d4:37",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-16-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.116"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
index bc2a13b907f..9f08a0d83ea 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-17",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.17",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-17-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.17",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:8a:8c",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:8a:8c",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:8a:8d",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.17",
+      "mac": "00:30:48:7f:8a:8d",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-17.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.17"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d2:42",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.117",
+      "mac": "00:30:48:96:d2:42",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-17-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.117"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
index a73b57c8ca6..00e89e42060 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-18",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.18",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-18-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.18",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:85:fa",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:85:fa",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:85:fb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.18",
+      "mac": "00:30:48:7f:85:fb",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-18.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.18"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d3:4d",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.118",
+      "mac": "00:30:48:96:d3:4d",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-18-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.118"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
index 3a969bd1fc2..fdb6a66577e 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-19",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.19",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-19-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.19",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:8a:8a",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:8a:8a",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:8a:8b",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.19",
+      "mac": "00:30:48:7f:8a:8b",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-19.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.19"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d1:f5",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.119",
+      "mac": "00:30:48:96:d1:f5",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-19-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.119"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
index 7e1fef38d40..b24e7eb92e6 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-2",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.2",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-2-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.2",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:91:62",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:91:62",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:91:63",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.2",
+      "mac": "00:30:48:7f:91:63",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-2.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.2"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d1:e2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.102",
+      "mac": "00:30:48:96:d1:e2",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-2-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.102"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
index da94a33d402..f04ea4bbac4 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-20",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.20",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-20-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.20",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:8a:86",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:8a:86",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:8a:87",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.20",
+      "mac": "00:30:48:7f:8a:87",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-20.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.20"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d3:bf",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.120",
+      "mac": "00:30:48:96:d3:bf",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-20-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.120"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
index 045ffb3c926..5fe5c39b139 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-21",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.21",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-21-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.21",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:3e:f0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:3e:f0",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:3e:f1",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.21",
+      "mac": "00:30:48:7f:3e:f1",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-21.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.21"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d3:56",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.121",
+      "mac": "00:30:48:96:d3:56",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-21-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.121"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
index 08fe5e7e5ab..43b99bd95d5 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-22",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.22",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-22-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.22",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:41:f4",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:41:f4",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:41:f5",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.22",
+      "mac": "00:30:48:7f:41:f5",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-22.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.22"
+      "rate": 1000000000
     },
     {
-      "mac": "",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.122",
+      "mac": "",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-22-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.122"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
index 078fc9a1736..6fc68b7859e 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-23",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.23",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-23-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.23",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:29:dc",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:29:dc",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:29:dd",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.23",
+      "mac": "00:30:48:7f:29:dd",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-23.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.23"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d2:d1",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.123",
+      "mac": "00:30:48:96:d2:d1",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-23-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.123"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
index 58e3d59c161..22bf124cdd2 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-24",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.24",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-24-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.24",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:29:de",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:29:de",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:29:df",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.24",
+      "mac": "00:30:48:7f:29:df",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-24.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.24"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d6:ff",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.124",
+      "mac": "00:30:48:96:d6:ff",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-24-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.124"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
index 9fd7dabc062..1027efef39b 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-25",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.25",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-25-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.25",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:41:5a",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:41:5a",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:41:5b",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.25",
+      "mac": "00:30:48:7f:41:5b",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-25.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.25"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d3:2d",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.125",
+      "mac": "00:30:48:96:d3:2d",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-25-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.125"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
index 8bb0cd5606b..d29dd616a73 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-26",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.26",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-26-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.26",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:41:5c",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:41:5c",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:41:5d",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.26",
+      "mac": "00:30:48:7f:41:5d",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-26.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.26"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d6:08",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.126",
+      "mac": "00:30:48:96:d6:08",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-26-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.126"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
index c41409390f8..9d71aecbd84 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-27",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.27",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-27-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.27",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:41:4e",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:41:4e",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:41:4f",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.27",
+      "mac": "00:30:48:7f:41:4f",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-27.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.27"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d3:1f",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.127",
+      "mac": "00:30:48:96:d3:1f",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-27-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.127"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
index 176ac29122a..b983e19e101 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-28",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.28",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-28-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.28",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:41:5e",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:41:5e",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:41:5f",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.28",
+      "mac": "00:30:48:7f:41:5f",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-28.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.28"
+      "rate": 1000000000
     },
     {
-      "mac": "",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.128",
+      "mac": "",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-28-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.128"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
index 7d0c019590a..5b21bc73168 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-29",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.29",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-29-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.29",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:29:ec",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:29:ec",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:29:ed",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.29",
+      "mac": "00:30:48:7f:29:ed",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-29.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.29"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d2:db",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.129",
+      "mac": "00:30:48:96:d2:db",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-29-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.129"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
index ec5a9abdfa4..1703dacb9aa 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-3",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.3",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-3-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.3",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:3f:0a",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:3f:0a",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:3f:0b",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.3",
+      "mac": "00:30:48:7f:3f:0b",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-3.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.3"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d3:44",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.103",
+      "mac": "00:30:48:96:d3:44",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-3-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.103"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
index bf8ea50dc79..16d3edc3fe7 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-30",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.30",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-30-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.30",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:29:da",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:29:da",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:29:db",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.30",
+      "mac": "00:30:48:7f:29:db",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-30.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.30"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d4:2f",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.130",
+      "mac": "00:30:48:96:d4:2f",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-30-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.130"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
index bd8023d8480..1e341d7d37f 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-31",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.31",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-31-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.31",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7F:41:57",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.31",
+      "mac": "00:30:48:7F:41:57",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-31.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.31"
+      "rate": 1000000000
     },
     {
-      "mac": "",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.131",
+      "mac": "",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-31-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.131"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
index 7d56032a5fb..041d713c372 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-32",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.32",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-32-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.32",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:41:50",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:41:50",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:41:51",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.32",
+      "mac": "00:30:48:7f:41:51",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-32.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.32"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d7:84",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.132",
+      "mac": "00:30:48:96:d7:84",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-32-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.132"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
index 1fb22e8507d..7448b202e9c 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-33",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.33",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-33-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.33",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:29:ee",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:29:ee",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:29:ef",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.33",
+      "mac": "00:30:48:7f:29:ef",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-33.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.33"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d2:dc",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.133",
+      "mac": "00:30:48:96:d2:dc",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-33-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.133"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
index 0c783fa9d05..3f88e05b3b6 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-34",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.34",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-34-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.34",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:29:40",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:29:40",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:29:41",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.34",
+      "mac": "00:30:48:7f:29:41",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-34.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.34"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d2:dd",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.134",
+      "mac": "00:30:48:96:d2:dd",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-34-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.134"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
index 4c06143c549..678cddf398e 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-4",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.4",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-4-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.4",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:44:8c",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:44:8c",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7F:44:8D",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.4",
+      "mac": "00:30:48:7F:44:8D",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-4.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.4"
+      "rate": 1000000000
     },
     {
-      "mac": "",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.104",
+      "mac": "",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-4-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.104"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
index 76ad21f0c35..bbf5c7ef91d 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-5",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.5",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-5-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.5",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:c1:b4:a6",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:c1:b4:a6",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:c1:b4:a7",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.5",
+      "mac": "00:30:48:c1:b4:a7",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-5.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.5"
+      "rate": 1000000000
     },
     {
-      "mac": "",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.105",
+      "mac": "",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-5-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.105"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
index 5558f07327e..c5e4d0edb0c 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-6",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.6",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-6-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.6",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7F:29:F3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.6",
+      "mac": "00:30:48:7F:29:F3",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-6.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.6"
+      "rate": 1000000000
     },
     {
-      "mac": "",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.106",
+      "mac": "",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-6-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.106"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
index b3c7e580eaa..e781d9f0c7f 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-7",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.7",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-7-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.7",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:29:e0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:29:e0",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:29:e1",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.7",
+      "mac": "00:30:48:7f:29:e1",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-7.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.7"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d1:d2",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.107",
+      "mac": "00:30:48:96:d1:d2",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-7-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.107"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
index 460578cfd9f..3879a3bc413 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-8",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.8",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-8-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.8",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:29:e2",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:29:e2",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:29:e3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.8",
+      "mac": "00:30:48:7f:29:e3",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-8.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.8"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d6:94",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.108",
+      "mac": "00:30:48:96:d6:94",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-8-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.108"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
index 9be3b4837c6..d89a46f4405 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 149011611938.477
-    }
-  ],
-  "uid": "genepi-9",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "ivt"
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -27,61 +13,75 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "version": "InfiniHost MHGH29-XTC",
+      "ip": "172.16.18.9",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-9-ib0.grenoble.grid5000.fr",
-      "management": false,
       "rate": 10000000000,
-      "ip": "172.16.18.9",
-      "vendor": "Mellanox"
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
     },
     {
       "device": "eth0",
-      "mac": "00:30:48:7f:3e:ea",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:3e:ea",
       "management": false,
       "rate": 1000000000
     },
     {
       "device": "eth1",
-      "mac": "00:30:48:7f:3e:eb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.16.16.9",
+      "mac": "00:30:48:7f:3e:eb",
+      "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-9.grenoble.grid5000.fr",
-      "management": false,
-      "rate": 1000000000,
-      "ip": "172.16.16.9"
+      "rate": 1000000000
     },
     {
-      "mac": "00:30:48:96:d4:8e",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.1.109",
+      "mac": "00:30:48:96:d4:8e",
+      "management": true,
       "mountable": false,
       "network_address": "genepi-9-bmc.grenoble.grid5000.fr",
-      "management": true,
-      "rate": 1000000000,
-      "ip": "192.168.1.109"
+      "rate": 1000000000
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "version": "E5420 QC",
-    "other_description": "",
-    "cache_l1": null,
     "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel"
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "genepi-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/grenoble.json b/data/grid5000/sites/grenoble/grenoble.json
index 3a866b30866..54b0463f4e9 100755
--- a/data/grid5000/sites/grenoble/grenoble.json
+++ b/data/grid5000/sites/grenoble/grenoble.json
@@ -1,14 +1,14 @@
 {
-  "type": "site",
-  "user_support_contact": null,
+  "description": "",
+  "email_contact": null,
   "latitude": 45.1833,
-  "uid": "grenoble",
+  "location": "Grenoble, France",
   "longitude": 5.7167,
-  "email_contact": null,
-  "sys_admin_contact": null,
   "name": "Grenoble",
-  "location": "Grenoble, France",
-  "description": "",
   "security_contact": null,
+  "sys_admin_contact": null,
+  "type": "site",
+  "uid": "grenoble",
+  "user_support_contact": null,
   "web": null
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json
index 34f46124e2b..bd2645afa4c 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-1.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/34",
+      "switch_port": "Gi3/34",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json
index 6b5c1206102..0ebf18db5cd 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-10.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/3",
+      "switch_port": "Gi4/3",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json
index 1ecf02fb3a8..58222edb23b 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-11.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/4",
+      "switch_port": "Gi4/4",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json
index ef24fd1a936..a34bef21542 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-12.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/5",
+      "switch_port": "Gi4/5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json
index 4bbc415fb98..ec8a9a32dc9 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-13.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/6",
+      "switch_port": "Gi4/6",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json
index b62d6c3ed8c..b35310eb1ce 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-14.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/7",
+      "switch_port": "Gi4/7",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json
index f23f4daf00e..41d3ba38ddf 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-15.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/8",
+      "switch_port": "Gi4/8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json
index 4cb851ca5f4..22812a275ff 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-16.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/9",
+      "switch_port": "Gi4/9",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json
index f034e1464e7..bfc186689d0 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-17.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/10",
+      "switch_port": "Gi4/10",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json
index f28d47dde43..bc3e9ed61f1 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-18.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/11",
+      "switch_port": "Gi4/11",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json
index 6c877303522..47e62bf0b80 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-19.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/12",
+      "switch_port": "Gi4/12",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json
index 8672c8269e6..44ac698c8d2 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-2.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/35",
+      "switch_port": "Gi3/35",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json
index a4469c17bbd..5192cabf62e 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-20.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/13",
+      "switch_port": "Gi4/13",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json
index f74c61c6167..1f75db47013 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-21.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/14",
+      "switch_port": "Gi4/14",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json
index 97bf0c04af2..4c41426ae04 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-22.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/15",
+      "switch_port": "Gi4/15",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json
index 6fbe783623c..f273623758c 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-23.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/16",
+      "switch_port": "Gi4/16",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json
index b7e12b623a8..e13a15eaa8d 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-24.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/17",
+      "switch_port": "Gi4/17",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json
index 760eb671c04..e8c5e8117ce 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-25.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/18",
+      "switch_port": "Gi4/18",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-26.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-26.json
index 1b44ef58c7f..7b80ef1136d 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-26.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-26.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-26.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/19",
+      "switch_port": "Gi4/19",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-3.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-3.json
index d0c6e08a9ca..1204ff92e5c 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-3.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-3.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-3.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/36",
+      "switch_port": "Gi3/36",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-4.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-4.json
index 657e9090b73..248895f8373 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-4.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-4.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-4.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/37",
+      "switch_port": "Gi3/37",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-5.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-5.json
index cdc46f7ceca..545766c7e7c 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-5.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-5.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-5.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/38",
+      "switch_port": "Gi3/38",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-6.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-6.json
index 9e7f692c997..b8ba7cb9139 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-6.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-6.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-6.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/39",
+      "switch_port": "Gi3/39",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-7.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-7.json
index 62ceb14a8d5..1100619c810 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-7.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-7.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-7.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/40",
+      "switch_port": "Gi3/40",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-8.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-8.json
index 11ff458cc0b..73add55abff 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-8.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-8.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-8.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/1",
+      "switch_port": "Gi4/1",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-9.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-9.json
index bce28529bb1..be534efafa5 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-9.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-9.json
@@ -38,7 +38,7 @@
       "network_address": "chicon-9.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi4\/2",
+      "switch_port": "Gi4/2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
index b1f450d0b83..a3bb418b753 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-1.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/1",
+      "switch_port": "Gi2/1",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
index 2f1f52f703f..655a1043d06 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-10.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/10",
+      "switch_port": "Gi2/10",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
index cec865f5ca9..121e5cb558c 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-11.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/11",
+      "switch_port": "Gi2/11",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
index 8d3c4e57d11..9c2637921b9 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-12.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/12",
+      "switch_port": "Gi2/12",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
index a69c182a2c9..deab623efe1 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-13.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/13",
+      "switch_port": "Gi2/13",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
index 42f38143783..116de4f2200 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-15.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/15",
+      "switch_port": "Gi2/15",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
index b1e0bd37101..f4e0aec9ba9 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-16.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/16",
+      "switch_port": "Gi2/16",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
index b0c6c1bffa3..f9e8f246c37 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-17.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/17",
+      "switch_port": "Gi2/17",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
index 61a5cba7443..b77eb43105d 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-18.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/18",
+      "switch_port": "Gi2/18",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
index d26aff9eb3e..eeaeee54e23 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-19.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/19",
+      "switch_port": "Gi2/19",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
index ef9328b4b9f..5b91cbcbd54 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-2.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/2",
+      "switch_port": "Gi2/2",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
index 8dbc6ad95b5..9c9c01e6673 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-20.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/20",
+      "switch_port": "Gi2/20",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
index bb4617295e5..3b605e7d629 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-21.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/21",
+      "switch_port": "Gi2/21",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
index 8a8699d21a3..52cdba283d3 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-22.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/22",
+      "switch_port": "Gi2/22",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json
index 8b864aa24e7..ebf6b3a364f 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-23.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/23",
+      "switch_port": "Gi2/23",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
index 8a6dbf0185b..4f641b9574f 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-24.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/24",
+      "switch_port": "Gi2/24",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
index bb63107476c..13319d39632 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-25.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/25",
+      "switch_port": "Gi2/25",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
index 4badd384e2f..98bb0b945ae 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-26.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/26",
+      "switch_port": "Gi2/26",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
index 9e66c092e35..1703affb263 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-27.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/27",
+      "switch_port": "Gi2/27",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
index ebb8da979af..6b44953324b 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-28.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/28",
+      "switch_port": "Gi2/28",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
index 24edb797309..1634fe9e89e 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-29.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/29",
+      "switch_port": "Gi2/29",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
index ac68086cba7..d76d9ca2ca0 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-3.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/3",
+      "switch_port": "Gi2/3",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
index 66b5e530a77..6fd5f39ba08 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-30.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/30",
+      "switch_port": "Gi2/30",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
index ec644726fa5..c3f72a5a024 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-31.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/31",
+      "switch_port": "Gi2/31",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
index b0bc5aa2bb8..0aef221ab30 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-32.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/32",
+      "switch_port": "Gi2/32",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json
index 76efcb0d13b..5433b091f9c 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-33.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/33",
+      "switch_port": "Gi2/33",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
index c2e60cbe35b..b074b0c5995 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-34.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/34",
+      "switch_port": "Gi2/34",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
index 4fd125c2e1d..9e2a21172df 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-35.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/35",
+      "switch_port": "Gi2/35",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
index 7b6e7dc495d..e91e4c3c13f 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-36.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/36",
+      "switch_port": "Gi2/36",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
index 90866d139b8..4c2cf13fd48 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-37.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/37",
+      "switch_port": "Gi2/37",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
index 8591d398cac..ded6b52860e 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-38.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/38",
+      "switch_port": "Gi2/38",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
index 9a09e3a3993..f9fed2cf713 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-39.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/39",
+      "switch_port": "Gi2/39",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
index 0c21baef6cc..92298e82481 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-4.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/4",
+      "switch_port": "Gi2/4",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
index 327cf399a04..2d19922e094 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-40.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/40",
+      "switch_port": "Gi2/40",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
index 587a46653cb..d69f9b9188f 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-41.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/1",
+      "switch_port": "Gi3/1",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
index 33489e085bb..3b6eccd368c 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-42.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/2",
+      "switch_port": "Gi3/2",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
index c2683162cf5..04a586c315d 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-43.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/3",
+      "switch_port": "Gi3/3",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
index c4e5eaadb8b..e69c9fac876 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-44.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/4",
+      "switch_port": "Gi3/4",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
index f9cd8365227..8e6aa4e35ab 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-45.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/5",
+      "switch_port": "Gi3/5",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json
index 5daa6ec527f..ec0a82ae23f 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-46.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/41",
+      "switch_port": "Gi3/41",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
index 6256ba260ae..3be67590cf2 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-5.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/41",
+      "switch_port": "Gi2/41",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
index 8f1f2eb210b..28d560f901c 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-6.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/6",
+      "switch_port": "Gi2/6",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
index 00fc1752ec0..1b529d6aa16 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-7.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/7",
+      "switch_port": "Gi2/7",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json
index 0cebda8f416..8be2aa18fe1 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-8.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/8",
+      "switch_port": "Gi2/8",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
index da08f9e00c7..168f1eb150e 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
@@ -38,7 +38,7 @@
       "network_address": "chinqchint-9.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi2\/9",
+      "switch_port": "Gi2/9",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-1.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-1.json
index 4085d9efb58..6cda43e36b3 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-1.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-1.json
@@ -38,7 +38,7 @@
       "network_address": "chti-1.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/14",
+      "switch_port": "Gi3/14",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-10.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-10.json
index 686f5d723c8..215948de4ff 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-10.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-10.json
@@ -38,7 +38,7 @@
       "network_address": "chti-10.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/24",
+      "switch_port": "Gi3/24",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-11.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-11.json
index d6f8971289a..a60b8d2ed2d 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-11.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-11.json
@@ -38,7 +38,7 @@
       "network_address": "chti-11.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/23",
+      "switch_port": "Gi3/23",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-12.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-12.json
index dc5ca87c739..cf068f3d792 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-12.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-12.json
@@ -38,7 +38,7 @@
       "network_address": "chti-12.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/25",
+      "switch_port": "Gi3/25",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-13.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-13.json
index bbab2b9d81f..9e298fa61d2 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-13.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-13.json
@@ -38,7 +38,7 @@
       "network_address": "chti-13.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/26",
+      "switch_port": "Gi3/26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-14.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-14.json
index 65e1b0faa7f..46c639cf379 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-14.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-14.json
@@ -38,7 +38,7 @@
       "network_address": "chti-14.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/27",
+      "switch_port": "Gi3/27",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-15.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-15.json
index d7c7f05daae..629c9361385 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-15.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-15.json
@@ -38,7 +38,7 @@
       "network_address": "chti-15.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/28",
+      "switch_port": "Gi3/28",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-16.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-16.json
index 3838321b751..209e93d1675 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-16.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-16.json
@@ -38,7 +38,7 @@
       "network_address": "chti-16.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/29",
+      "switch_port": "Gi3/29",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-17.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-17.json
index c4173567c73..91003d12520 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-17.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-17.json
@@ -38,7 +38,7 @@
       "network_address": "chti-17.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/30",
+      "switch_port": "Gi3/30",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-18.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-18.json
index 0a2c8f0c237..83026b8000d 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-18.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-18.json
@@ -38,7 +38,7 @@
       "network_address": "chti-18.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/31",
+      "switch_port": "Gi3/31",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-19.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-19.json
index 415b6c008d5..8191ecd0ee0 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-19.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-19.json
@@ -38,7 +38,7 @@
       "network_address": "chti-19.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/32",
+      "switch_port": "Gi3/32",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-2.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-2.json
index d6551765b05..e9821987c2e 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-2.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-2.json
@@ -38,7 +38,7 @@
       "network_address": "chti-2.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/15",
+      "switch_port": "Gi3/15",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-20.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-20.json
index 6af2b08114f..dcc43844aec 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-20.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-20.json
@@ -38,7 +38,7 @@
       "network_address": "chti-20.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/33",
+      "switch_port": "Gi3/33",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-3.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-3.json
index f6a0167c820..6a1b669203e 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-3.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-3.json
@@ -38,7 +38,7 @@
       "network_address": "chti-3.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/16",
+      "switch_port": "Gi3/16",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-4.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-4.json
index 5d0a336eb39..0e8508b64fd 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-4.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-4.json
@@ -38,7 +38,7 @@
       "network_address": "chti-4.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/17",
+      "switch_port": "Gi3/17",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-5.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-5.json
index cfdab52a454..3c25eb644f7 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-5.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-5.json
@@ -38,7 +38,7 @@
       "network_address": "chti-5.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/18",
+      "switch_port": "Gi3/18",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-6.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-6.json
index 4a6783ac813..ca30a96de47 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-6.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-6.json
@@ -38,7 +38,7 @@
       "network_address": "chti-6.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/19",
+      "switch_port": "Gi3/19",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-7.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-7.json
index dcb19a41d94..c19d4160c6b 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-7.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-7.json
@@ -38,7 +38,7 @@
       "network_address": "chti-7.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/20",
+      "switch_port": "Gi3/20",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-8.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-8.json
index 67fbaf35a3a..2a5ff78ed97 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-8.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-8.json
@@ -38,7 +38,7 @@
       "network_address": "chti-8.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/21",
+      "switch_port": "Gi3/21",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-9.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-9.json
index 1f602fbfad3..2ab77e4ecb8 100755
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-9.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-9.json
@@ -38,7 +38,7 @@
       "network_address": "chti-9.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": "Gi3\/22",
+      "switch_port": "Gi3/22",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/lille/environments/lenny-x64-base-2.3.json b/data/grid5000/sites/lille/environments/lenny-x64-base-2.3.json
new file mode 120000
index 00000000000..2bf7b5a444d
--- /dev/null
+++ b/data/grid5000/sites/lille/environments/lenny-x64-base-2.3.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/lenny-x64-base-2.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/capricorne.json b/data/grid5000/sites/lyon/clusters/capricorne/capricorne.json
index dd035bd4658..cbe20cd387f 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/capricorne.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/capricorne.json
@@ -1,7 +1,7 @@
 {
-  "type": "cluster",
+  "created_at": "Wed, 01 Dec 2004 12:00:00 GMT",
   "misc": "bios: 1.36 / bcm: 1.20.9 / bmc: 1.46",
-  "uid": "capricorne",
   "model": "IBM eServer 325",
-  "created_at": "Wed, 01 Dec 2004 12:00:00 GMT"
+  "type": "cluster",
+  "uid": "capricorne"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-1.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-1.json
index b4f4ffaef7a..6771d85a784 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-1.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-1.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-1",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a2:7a",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a2:7a",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a2:7b",
-      "ip": "10.69.0.1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.1",
+      "mac": "00:0d:60:14:a2:7b",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-1.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-1.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.1",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.1",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-1-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-1-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-10.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-10.json
index daddd750a02..a5d43faf79b 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-10.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-10.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-10",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:2c",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a3:2c",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:2d",
-      "ip": "10.69.0.10",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.10",
+      "mac": "00:0d:60:14:a3:2d",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-10.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-10.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.10",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.10",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-10-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-10-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-11.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-11.json
index 9430a5eb3b2..57fc615838f 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-11.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-11.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-11",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:11:25:1e:79:28",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:11:25:1e:79:28",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:11:25:1e:79:29",
-      "ip": "10.69.0.11",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.11",
+      "mac": "00:11:25:1e:79:29",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-11.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-11.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.11",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.11",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-11-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-11-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-12.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-12.json
index 40ce1d868c3..d4da4a75415 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-12.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-12.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-12",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:9f:96",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:9f:96",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:9f:97",
-      "ip": "10.69.0.12",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.12",
+      "mac": "00:0d:60:14:9f:97",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-12.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-12.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.12",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.12",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-12-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-12-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-13.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-13.json
index f87018da6ca..4cbebbc8606 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-13.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-13.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-13",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:11:25:1e:78:dc",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:11:25:1e:78:dc",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:11:25:1e:78:dd",
-      "ip": "10.69.0.13",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.13",
+      "mac": "00:11:25:1e:78:dd",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-13.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-13.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.13",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.13",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-13-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-13-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-14.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-14.json
index e0b9620f17f..f885bc1614f 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-14.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-14.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-14",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a0:f0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a0:f0",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a0:f1",
-      "ip": "10.69.0.14",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.14",
+      "mac": "00:0d:60:14:a0:f1",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-14.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-14.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.14",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.14",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-14-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-14-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-15.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-15.json
index 6a95d298277..f7d6a71ff69 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-15.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-15.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-15",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:11:25:1e:79:32",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:11:25:1e:79:32",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:11:25:1e:79:33",
-      "ip": "10.69.0.15",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.15",
+      "mac": "00:11:25:1e:79:33",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-15.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-15.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.15",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.15",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-15-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-15-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-16.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-16.json
index 2f387ebb6a0..0846c79d5b3 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-16.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-16.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-16",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.0.16",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.16",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-16.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-16.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.16",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.16",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-16-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-16-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-17.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-17.json
index e8374bcc253..0b74f15ca0e 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-17.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-17.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-17",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:11:25:1e:79:1c",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:11:25:1e:79:1c",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:11:25:1e:79:1d",
-      "ip": "10.69.0.17",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.17",
+      "mac": "00:11:25:1e:79:1d",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-17.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-17.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.17",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.17",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-17-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-17-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-18.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-18.json
index 97d3f05583f..84645d25d85 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-18.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-18.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-18",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:9f:3c",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:9f:3c",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:9f:3d",
-      "ip": "10.69.0.18",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.18",
+      "mac": "00:0d:60:14:9f:3d",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-18.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-18.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.18",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.18",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-18-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-18-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-19.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-19.json
index 00f5e5b4f08..043dee2bf32 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-19.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-19.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-19",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:4e",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a3:4e",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:4f",
-      "ip": "10.69.0.19",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.19",
+      "mac": "00:0d:60:14:a3:4f",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-19.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-19.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.19",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.19",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-19-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-19-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-2.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-2.json
index e73d165994d..1aa1582bfa8 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-2.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-2.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-2",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a2:d6",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a2:d6",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a2:d7",
-      "ip": "10.69.0.2",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.2",
+      "mac": "00:0d:60:14:a2:d7",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-2.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-2.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.2",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.2",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-2-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-2-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-20.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-20.json
index 7f246719b79..ec1849a4f25 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-20.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-20.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-20",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:20",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a3:20",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:21",
-      "ip": "10.69.0.20",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.20",
+      "mac": "00:0d:60:14:a3:21",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-20.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-20.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.20",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.20",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-20-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-20-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-21.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-21.json
index 64633c0d17d..d2c26415547 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-21.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-21.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-21",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:42",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a3:42",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:43",
-      "ip": "10.69.0.21",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.21",
+      "mac": "00:0d:60:14:a3:43",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-21.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-21.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.21",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.21",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-21-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-21-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-22.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-22.json
index 15e53fb66b3..f7727fb2e73 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-22.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-22.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-22",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:44",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a3:44",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:45",
-      "ip": "10.69.0.22",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.22",
+      "mac": "00:0d:60:14:a3:45",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-22.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-22.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.22",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.22",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-22-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-22-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-23.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-23.json
index 568f09cf18e..f8e0d3d0fb0 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-23.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-23.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-23",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:70",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a3:70",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:71",
-      "ip": "10.69.0.23",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.23",
+      "mac": "00:0d:60:14:a3:71",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-23.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-23.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.23",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.23",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-23-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-23-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-24.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-24.json
index fc90be286d2..c7eda1afa4c 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-24.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-24.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-24",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a0:d6",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a0:d6",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a0:d7",
-      "ip": "10.69.0.24",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.24",
+      "mac": "00:0d:60:14:a0:d7",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-24.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-24.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.24",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.24",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-24-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-24-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-25.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-25.json
index a8e514dc43f..2ba503def62 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-25.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-25.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-25",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:1a",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a3:1a",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:1b",
-      "ip": "10.69.0.25",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.25",
+      "mac": "00:0d:60:14:a3:1b",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-25.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-25.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.25",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.25",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-25-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-25-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-26.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-26.json
index 0247a34a526..68725c59c88 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-26.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-26.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-26",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:08",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a3:08",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:09",
-      "ip": "10.69.0.26",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.26",
+      "mac": "00:0d:60:14:a3:09",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-26.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-26.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.26",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.26",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-26-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-26-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-27.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-27.json
index cb7ec13d122..80d44753850 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-27.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-27.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-27",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:28",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a3:28",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:29",
-      "ip": "10.69.0.27",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.27",
+      "mac": "00:0d:60:14:a3:29",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-27.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-27.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.27",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.27",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-27-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-27-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-28.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-28.json
index 62cae6f6682..f0c46c568e3 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-28.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-28.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-28",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:68",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a1:68",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:69",
-      "ip": "10.69.0.28",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.28",
+      "mac": "00:0d:60:14:a1:69",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-28.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-28.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.28",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.28",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-28-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-28-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-29.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-29.json
index fb9553db633..a0807bba205 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-29.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-29.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-29",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:26",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a3:26",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:27",
-      "ip": "10.69.0.29",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.29",
+      "mac": "00:0d:60:14:a3:27",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-29.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-29.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.29",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.29",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-29-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-29-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-3.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-3.json
index e06f9a2f625..c79726aa125 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-3.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-3.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-3",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a0:3e",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a0:3e",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a0:3f",
-      "ip": "10.69.0.3",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.3",
+      "mac": "00:0d:60:14:a0:3f",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-3.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-3.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.3",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.3",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-3-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-3-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-30.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-30.json
index 335c9d8869a..f9b44685ffe 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-30.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-30.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-30",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:66",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a3:66",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:67",
-      "ip": "10.69.0.30",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.30",
+      "mac": "00:0d:60:14:a3:67",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-30.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-30.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.30",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.30",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-30-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-30-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-31.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-31.json
index 2b92d0e577a..7d6c1660b49 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-31.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-31.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-31",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.0.31",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.31",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-31.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-31.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.31",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.31",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-31-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-31-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-32.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-32.json
index 005ed9fd484..120d83100c8 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-32.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-32.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-32",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a2:fa",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a2:fa",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a2:fb",
-      "ip": "10.69.0.32",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.32",
+      "mac": "00:0d:60:14:a2:fb",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-32.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-32.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.32",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.32",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-32-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-32-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-33.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-33.json
index 446e76d3c4b..46a2553a4e8 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-33.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-33.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-33",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.0.33",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.33",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-33.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-33.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.33",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.33",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-33-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-33-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-34.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-34.json
index 9129bf32e90..10594b69a5f 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-34.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-34.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-34",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a0:e6",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a0:e6",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a0:e7",
-      "ip": "10.69.0.34",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.34",
+      "mac": "00:0d:60:14:a0:e7",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-34.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-34.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.34",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.34",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-34-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-34-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-35.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-35.json
index 9ab79e98ffd..34138092a69 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-35.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-35.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-35",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:64",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a1:64",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:65",
-      "ip": "10.69.0.35",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.35",
+      "mac": "00:0d:60:14:a1:65",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-35.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-35.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.35",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.35",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-35-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-35-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-36.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-36.json
index 62830e4208d..79634f4dd4e 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-36.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-36.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-36",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:2e",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a1:2e",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:2f",
-      "ip": "10.69.0.36",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.36",
+      "mac": "00:0d:60:14:a1:2f",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-36.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-36.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.36",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.36",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-36-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-36-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-37.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-37.json
index 94ec6a8dcd8..3d1a84f4099 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-37.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-37.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-37",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:ee",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a1:ee",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:ef",
-      "ip": "10.69.0.37",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.37",
+      "mac": "00:0d:60:14:a1:ef",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-37.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-37.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.37",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.37",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-37-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-37-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-38.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-38.json
index 968b4c137b8..35e413d5e21 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-38.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-38.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-38",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.0.38",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.38",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-38.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-38.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.38",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.38",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-38-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-38-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-39.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-39.json
index c403a4da010..7fbde21513b 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-39.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-39.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-39",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a2:d0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a2:d0",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a2:d1",
-      "ip": "10.69.0.39",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.39",
+      "mac": "00:0d:60:14:a2:d1",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-39.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-39.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.39",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.39",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-39-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-39-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-4.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-4.json
index 717d55a7f0a..ece30348c99 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-4.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-4.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-4",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:11:25:1e:79:0c",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:11:25:1e:79:0c",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:11:25:1e:79:0d",
-      "ip": "10.69.0.4",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.4",
+      "mac": "00:11:25:1e:79:0d",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-4.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-4.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.4",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.4",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-4-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-4-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-40.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-40.json
index 9eddddcb1df..c5a4f33ab02 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-40.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-40.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-40",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a0:2e",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a0:2e",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a0:2f",
-      "ip": "10.69.0.40",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.40",
+      "mac": "00:0d:60:14:a0:2f",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-40.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-40.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.40",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.40",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-40-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-40-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-41.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-41.json
index 12812b00d0c..fa9a6d55475 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-41.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-41.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-41",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:f0",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a1:f0",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:f1",
-      "ip": "10.69.0.41",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.41",
+      "mac": "00:0d:60:14:a1:f1",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-41.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-41.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.41",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.41",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-41-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-41-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-42.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-42.json
index be5cd6f0dd2..abb6cfb3791 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-42.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-42.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-42",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:9f:9a",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:9f:9a",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:9f:9b",
-      "ip": "10.69.0.42",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.42",
+      "mac": "00:0d:60:14:9f:9b",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-42.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-42.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.42",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.42",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-42-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-42-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-43.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-43.json
index e47035ff48d..b339a813616 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-43.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-43.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-43",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:52",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a3:52",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:53",
-      "ip": "10.69.0.43",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.43",
+      "mac": "00:0d:60:14:a3:53",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-43.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-43.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.43",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.43",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-43-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-43-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-44.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-44.json
index 4968ab61ff8..2c9b2c346ae 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-44.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-44.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-44",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:3a",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a3:3a",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:3b",
-      "ip": "10.69.0.44",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.44",
+      "mac": "00:0d:60:14:a3:3b",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-44.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-44.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.44",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.44",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-44-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-44-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-45.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-45.json
index 9fe57243f50..f3f02561e02 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-45.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-45.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-45",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:4e",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a1:4e",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:4f",
-      "ip": "10.69.0.45",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.45",
+      "mac": "00:0d:60:14:a1:4f",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-45.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-45.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.45",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.45",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-45-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-45-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-46.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-46.json
index 524ad3bc65c..35614c46b84 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-46.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-46.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-46",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a0:ec",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a0:ec",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a0:ed",
-      "ip": "10.69.0.46",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.46",
+      "mac": "00:0d:60:14:a0:ed",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-46.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-46.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.46",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.46",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-46-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-46-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-47.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-47.json
index 5b10bba26c5..be0aa2cafab 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-47.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-47.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-47",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:9f:d4",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:9f:d4",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:9f:d5",
-      "ip": "10.69.0.47",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.47",
+      "mac": "00:0d:60:14:9f:d5",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-47.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-47.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.47",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.47",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-47-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-47-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-48.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-48.json
index 3dc6e879313..484285c2c9c 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-48.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-48.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-48",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.0.48",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.48",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-48.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-48.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.48",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.48",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-48-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-48-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-49.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-49.json
index 1950b21ecef..e5ff753ab76 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-49.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-49.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-49",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a0:32",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a0:32",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a0:33",
-      "ip": "10.69.0.49",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.49",
+      "mac": "00:0d:60:14:a0:33",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-49.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-49.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.49",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.49",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-49-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-49-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-5.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-5.json
index 0206da1c945..87636300374 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-5.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-5.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-5",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.0.5",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.5",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-5.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-5.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.5",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.5",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-5-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-5-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-50.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-50.json
index 1c1e79f8922..0982aec3265 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-50.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-50.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-50",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.0.50",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.50",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-50.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-50.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.50",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.50",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-50-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-50-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-51.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-51.json
index 62e8c56cc27..3d8a326ced5 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-51.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-51.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-51",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.0.51",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.51",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-51.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-51.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.51",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.51",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-51-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-51-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-52.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-52.json
index f05064a1e2f..cc67f40d03b 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-52.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-52.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-52",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:0a",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a3:0a",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a3:0b",
-      "ip": "10.69.0.52",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.52",
+      "mac": "00:0d:60:14:a3:0b",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-52.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-52.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.52",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.52",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-52-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-52-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-53.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-53.json
index 1be890255f8..7111fef3319 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-53.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-53.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-53",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a0:12",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a0:12",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a0:13",
-      "ip": "10.69.0.53",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.53",
+      "mac": "00:0d:60:14:a0:13",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-53.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-53.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.53",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.53",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-53-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-53-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-54.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-54.json
index aad24820b97..8149b74d879 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-54.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-54.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-54",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:16",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a1:16",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:17",
-      "ip": "10.69.0.54",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.54",
+      "mac": "00:0d:60:14:a1:17",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-54.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-54.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.54",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.54",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-54-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-54-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-55.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-55.json
index a1bcd565fcb..5724832b9b8 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-55.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-55.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-55",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:a8",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a1:a8",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:a9",
-      "ip": "10.69.0.55",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.55",
+      "mac": "00:0d:60:14:a1:a9",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-55.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-55.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.55",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.55",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-55-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-55-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-56.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-56.json
index 902e37c8109..e69358102e8 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-56.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-56.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-56",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.0.56",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.56",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-56.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-56.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.56",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.56",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-56-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-56-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-6.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-6.json
index 69b582b9a0c..aadf7c948a5 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-6.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-6.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-6",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:58",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:a1:58",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:a1:59",
-      "ip": "10.69.0.6",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.6",
+      "mac": "00:0d:60:14:a1:59",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-6.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-6.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.6",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.6",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-6-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-6-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-7.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-7.json
index 40745727b8c..b6d2fe3fb57 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-7.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-7.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-7",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.0.7",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.7",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-7.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-7.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.7",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.7",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-7-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-7-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-8.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-8.json
index b44e4250a33..9f32bbf852e 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-8.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-8.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-8",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:9f:8a",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": "00:0d:60:14:9f:8a",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:0d:60:14:9f:8b",
-      "ip": "10.69.0.8",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.8",
+      "mac": "00:0d:60:14:9f:8b",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-8.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-8.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.8",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.8",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-8-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-8-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-9.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-9.json
index 065f220ea15..8bf9ebba13b 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-9.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-9.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "capricorne-9",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,59 +10,78 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.0.9",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.0.9",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "capricorne-9.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "capricorne-9.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": "",
-      "ip": "10.69.8.9",
+      "driver": "",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "10.69.8.9",
+      "mac": "",
       "management": false,
-      "driver": "",
-      "network_address": "capricorne-9-myri0.lyon.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "capricorne-9-myri0.lyon.grid5000.fr",
+      "rate": 2000000000,
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "capricorne-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
index f50972dcd55..c61bd3d7710 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-1",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:9e:13",
-      "ip": "10.69.1.101",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.101",
+      "mac": "00:09:3d:12:9e:13",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:9e:14",
-      "ip": "10.69.1.1",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.1",
+      "mac": "00:09:3d:12:9e:14",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-1.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-1.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.json
index 7941a74869f..ec2fcc22d4f 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-10",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:11:aa:e1",
-      "ip": "10.69.1.110",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.110",
+      "mac": "00:09:3d:11:aa:e1",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:11:aa:e2",
-      "ip": "10.69.1.10",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.10",
+      "mac": "00:09:3d:11:aa:e2",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-10.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-10.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
index 7e54a7b9d91..ca3feac660a 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-11",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:9e:06",
-      "ip": "10.69.1.111",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.111",
+      "mac": "00:09:3d:12:9e:06",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:9e:07",
-      "ip": "10.69.1.11",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.11",
+      "mac": "00:09:3d:12:9e:07",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-11.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-11.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
index c9d81436d2a..540bdc2fa25 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-12",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:3c:2b",
-      "ip": "10.69.1.112",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.112",
+      "mac": "00:09:3d:12:3c:2b",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:3c:2c",
-      "ip": "10.69.1.12",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.12",
+      "mac": "00:09:3d:12:3c:2c",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-12.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-12.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
index a20741a551d..c4c8ad43fd2 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-13",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:91:60",
-      "ip": "10.69.1.113",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.113",
+      "mac": "00:09:3d:12:91:60",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:91:61",
-      "ip": "10.69.1.13",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.13",
+      "mac": "00:09:3d:12:91:61",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-13.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-13.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
index 838aa8b2a15..026e9b80f8d 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-14",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:7a:bc",
-      "ip": "10.69.1.114",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.114",
+      "mac": "00:09:3d:12:7a:bc",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:7a:bd",
-      "ip": "10.69.1.14",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.14",
+      "mac": "00:09:3d:12:7a:bd",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-14.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-14.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
index 2462ed4f03a..2c614dab7f2 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-15",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:28:70",
-      "ip": "10.69.1.115",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.115",
+      "mac": "00:09:3d:12:28:70",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:28:71",
-      "ip": "10.69.1.15",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.15",
+      "mac": "00:09:3d:12:28:71",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-15.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-15.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
index 8b58d4b66e1..99332b36474 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-16",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:7d:06",
-      "ip": "10.69.1.116",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.116",
+      "mac": "00:09:3d:12:7d:06",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:7d:07",
-      "ip": "10.69.1.16",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.16",
+      "mac": "00:09:3d:12:7d:07",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-16.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-16.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
index beb00beefd2..a9adc38e951 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-17",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:11:e7:62",
-      "ip": "10.69.1.117",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.117",
+      "mac": "00:09:3d:11:e7:62",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:11:e7:63",
-      "ip": "10.69.1.17",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.17",
+      "mac": "00:09:3d:11:e7:63",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-17.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-17.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
index d109749d86b..dd5996f2e1e 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-18",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:7e:f1",
-      "ip": "10.69.1.118",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.118",
+      "mac": "00:09:3d:12:7e:f1",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:7e:f2",
-      "ip": "10.69.1.18",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.18",
+      "mac": "00:09:3d:12:7e:f2",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-18.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-18.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
index 8e9688dbf80..29fe1b7e342 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-19",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:90:56",
-      "ip": "10.69.1.119",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.119",
+      "mac": "00:09:3d:12:90:56",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:90:57",
-      "ip": "10.69.1.19",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.19",
+      "mac": "00:09:3d:12:90:57",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-19.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-19.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
index 097525e5818..ced9cae7ba1 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-2",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.102",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.102",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.2",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.2",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-2.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-2.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
index ccd2408c968..01c5c4d19b6 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-20",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:90:83",
-      "ip": "10.69.1.120",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.120",
+      "mac": "00:09:3d:12:90:83",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:90:84",
-      "ip": "10.69.1.20",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.20",
+      "mac": "00:09:3d:12:90:84",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-20.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-20.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.json
index 963e88e95b4..3ced57da3e8 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-21",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.121",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.121",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.21",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.21",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-21.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-21.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.json
index beb5acb7b92..bec94b67444 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-22",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:90:9e",
-      "ip": "10.69.1.122",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.122",
+      "mac": "00:09:3d:12:90:9e",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:90:9f",
-      "ip": "10.69.1.22",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.22",
+      "mac": "00:09:3d:12:90:9f",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-22.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-22.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.json
index cda58ded76f..36408c3c042 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-23",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:7d:46",
-      "ip": "10.69.1.123",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.123",
+      "mac": "00:09:3d:12:7d:46",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:7d:47",
-      "ip": "10.69.1.23",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.23",
+      "mac": "00:09:3d:12:7d:47",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-23.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-23.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
index 54a511e50e7..34adf21591a 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-24",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:50:85",
-      "ip": "10.69.1.124",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.124",
+      "mac": "00:09:3d:12:50:85",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:50:86",
-      "ip": "10.69.1.24",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.24",
+      "mac": "00:09:3d:12:50:86",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-24.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-24.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.json
index 7dc2a276e58..96c77ca2fe8 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-25",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:10:de:8d",
-      "ip": "10.69.1.125",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.125",
+      "mac": "00:09:3d:10:de:8d",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:10:de:8e",
-      "ip": "10.69.1.25",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.25",
+      "mac": "00:09:3d:10:de:8e",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-25.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-25.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.json
index d9fef9401f6..10bb53da5f5 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-26",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:11:ce:21",
-      "ip": "10.69.1.126",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.126",
+      "mac": "00:09:3d:11:ce:21",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:11:ce:22",
-      "ip": "10.69.1.26",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.26",
+      "mac": "00:09:3d:11:ce:22",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-26.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-26.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
index abd465cb76c..4a797de0ab7 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-27",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:6a:f0",
-      "ip": "10.69.1.127",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.127",
+      "mac": "00:09:3d:12:6a:f0",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:6a:f1",
-      "ip": "10.69.1.27",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.27",
+      "mac": "00:09:3d:12:6a:f1",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-27.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-27.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.json
index 167a821029d..4d325d1f75b 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-28",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:33:e5",
-      "ip": "10.69.1.128",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.128",
+      "mac": "00:09:3d:12:33:e5",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:33:e6",
-      "ip": "10.69.1.28",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.28",
+      "mac": "00:09:3d:12:33:e6",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-28.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-28.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
index bf76e4e8ead..2cdbf4d6236 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-29",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:11:e9:fe",
-      "ip": "10.69.1.129",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.129",
+      "mac": "00:09:3d:11:e9:fe",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:11:e9:ff",
-      "ip": "10.69.1.29",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.29",
+      "mac": "00:09:3d:11:e9:ff",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-29.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-29.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
index 72b01c4e893..c4da81ceaf6 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-3",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:91:66",
-      "ip": "10.69.1.103",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.103",
+      "mac": "00:09:3d:12:91:66",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:91:67",
-      "ip": "10.69.1.3",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.3",
+      "mac": "00:09:3d:12:91:67",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-3.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-3.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
index bf739a51ce6..4747639f7a4 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-30",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:7c:93",
-      "ip": "10.69.1.130",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.130",
+      "mac": "00:09:3d:12:7c:93",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:7c:94",
-      "ip": "10.69.1.30",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.30",
+      "mac": "00:09:3d:12:7c:94",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-30.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-30.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
index 2149b223291..edefaa5b908 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-31",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:c9:0c",
-      "ip": "10.69.1.131",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.131",
+      "mac": "00:09:3d:12:c9:0c",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:c9:0e",
-      "ip": "10.69.1.31",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.31",
+      "mac": "00:09:3d:12:c9:0e",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-31.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-31.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.json
index 426fe156416..938f5df2dee 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-32",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:a5:74",
-      "ip": "10.69.1.132",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.132",
+      "mac": "00:09:3d:12:a5:74",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:a5:75",
-      "ip": "10.69.1.32",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.32",
+      "mac": "00:09:3d:12:a5:75",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-32.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-32.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.json
index 8ae0f4e6075..b96f5dc1dc6 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-33",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:92:70",
-      "ip": "10.69.1.133",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.133",
+      "mac": "00:09:3d:12:92:70",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:92:71",
-      "ip": "10.69.1.33",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.33",
+      "mac": "00:09:3d:12:92:71",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-33.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-33.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.json
index 3a810478a0d..c88090a6b1e 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-34",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.134",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.134",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.34",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.34",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-34.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-34.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.json
index 053b133b727..1d001872ce1 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-35",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:28:16",
-      "ip": "10.69.1.135",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.135",
+      "mac": "00:09:3d:12:28:16",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:28:17",
-      "ip": "10.69.1.35",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.35",
+      "mac": "00:09:3d:12:28:17",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-35.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-35.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.json
index d921a6e16e8..83def6c0536 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-36",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:10:c7:ba",
-      "ip": "10.69.1.136",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.136",
+      "mac": "00:09:3d:10:c7:ba",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:10:c7:bb",
-      "ip": "10.69.1.36",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.36",
+      "mac": "00:09:3d:10:c7:bb",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-36.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-36.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.json
index 68731550420..20a2c458ea8 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-37",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:69:f8",
-      "ip": "10.69.1.137",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.137",
+      "mac": "00:09:3d:12:69:f8",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:69:f9",
-      "ip": "10.69.1.37",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.37",
+      "mac": "00:09:3d:12:69:f9",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-37.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-37.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.json
index b280d2adf62..77fedc3e412 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-38",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:38:6a",
-      "ip": "10.69.1.138",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.138",
+      "mac": "00:09:3d:12:38:6a",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:38:6b",
-      "ip": "10.69.1.38",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.38",
+      "mac": "00:09:3d:12:38:6b",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-38.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-38.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.json
index 011b94f9fb1..4c4cda40332 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-39",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:4f:18",
-      "ip": "10.69.1.139",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.139",
+      "mac": "00:09:3d:12:4f:18",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:4f:19",
-      "ip": "10.69.1.39",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.39",
+      "mac": "00:09:3d:12:4f:19",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-39.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-39.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
index f5b1fab5b67..a55075b07ed 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-4",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:7e:bb",
-      "ip": "10.69.1.104",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.104",
+      "mac": "00:09:3d:12:7e:bb",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:7e:bc",
-      "ip": "10.69.1.4",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.4",
+      "mac": "00:09:3d:12:7e:bc",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-4.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-4.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.json
index 59da2369970..e5b2a5d98e8 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-40",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.140",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.140",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.40",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.40",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-40.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-40.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.json
index d60e983b7a6..8a055c8dba1 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-41",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:6a:41",
-      "ip": "10.69.1.141",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.141",
+      "mac": "00:09:3d:12:6a:41",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:6a:42",
-      "ip": "10.69.1.41",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.41",
+      "mac": "00:09:3d:12:6a:42",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-41.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-41.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.json
index 11c9dcb49c6..fcfbd1ec13d 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-42",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:74:d4",
-      "ip": "10.69.1.142",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.142",
+      "mac": "00:09:3d:12:74:d4",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:74:d5",
-      "ip": "10.69.1.42",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.42",
+      "mac": "00:09:3d:12:74:d5",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-42.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-42.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.json
index bca83934270..9f924e58bfa 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-43",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:28:4f",
-      "ip": "10.69.1.143",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.143",
+      "mac": "00:09:3d:12:28:4f",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:28:50",
-      "ip": "10.69.1.43",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.43",
+      "mac": "00:09:3d:12:28:50",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-43.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-43.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.json
index e1de1b48123..7eb4215cadb 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-44",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:a4:b4",
-      "ip": "10.69.1.144",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.144",
+      "mac": "00:09:3d:12:a4:b4",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:a4:b5",
-      "ip": "10.69.1.44",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.44",
+      "mac": "00:09:3d:12:a4:b5",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-44.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-44.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.json
index 137d448f992..2c128dbb35a 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-45",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:3c:61",
-      "ip": "10.69.1.145",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.145",
+      "mac": "00:09:3d:12:3c:61",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:3c:62",
-      "ip": "10.69.1.45",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.45",
+      "mac": "00:09:3d:12:3c:62",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-45.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-45.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.json
index f8132bfb74a..6bba0384785 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-46",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:9d:e5",
-      "ip": "10.69.1.146",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.146",
+      "mac": "00:09:3d:12:9d:e5",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:9d:e6",
-      "ip": "10.69.1.46",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.46",
+      "mac": "00:09:3d:12:9d:e6",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-46.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-46.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.json
index 4c6d2fd9ae0..724fbe09943 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-47",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:3c:03",
-      "ip": "10.69.1.147",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.147",
+      "mac": "00:09:3d:12:3c:03",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:3c:04",
-      "ip": "10.69.1.47",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.47",
+      "mac": "00:09:3d:12:3c:04",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-47.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-47.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.json
index 993b1b0c065..7656ff4cdd4 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-48",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.148",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.148",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.48",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.48",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-48.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-48.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.json
index 14ef1939b15..35f7025488d 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-49",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:3b:dd",
-      "ip": "10.69.1.149",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.149",
+      "mac": "00:09:3d:12:3b:dd",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:3b:de",
-      "ip": "10.69.1.49",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.49",
+      "mac": "00:09:3d:12:3b:de",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-49.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-49.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
index b72eff6bbf2..94daf2b7082 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-5",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:3b:79",
-      "ip": "10.69.1.105",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.105",
+      "mac": "00:09:3d:12:3b:79",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:3b:7a",
-      "ip": "10.69.1.5",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.5",
+      "mac": "00:09:3d:12:3b:7a",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-5.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-5.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.json
index 2c55b0ce72b..893d013e383 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-50",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:69:b7",
-      "ip": "10.69.1.150",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.150",
+      "mac": "00:09:3d:12:69:b7",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:69:b8",
-      "ip": "10.69.1.50",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.50",
+      "mac": "00:09:3d:12:69:b8",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-50.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-50.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.json
index bfeddc789b9..7717180a56f 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-51",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:3c:70",
-      "ip": "10.69.1.151",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.151",
+      "mac": "00:09:3d:12:3c:70",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:3c:71",
-      "ip": "10.69.1.51",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.51",
+      "mac": "00:09:3d:12:3c:71",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-51.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-51.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.json
index 0609d4fe4d0..f544534da6b 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-52",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:27:66",
-      "ip": "10.69.1.152",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.152",
+      "mac": "00:09:3d:12:27:66",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:27:67",
-      "ip": "10.69.1.52",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.52",
+      "mac": "00:09:3d:12:27:67",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-52.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-52.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.json
index cd847701b8b..b50c651643e 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-53",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:9d:8b",
-      "ip": "10.69.1.153",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.153",
+      "mac": "00:09:3d:12:9d:8b",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:9d:8c",
-      "ip": "10.69.1.53",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.53",
+      "mac": "00:09:3d:12:9d:8c",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-53.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-53.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.json
index 7d10276ee36..922e38b4922 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-54",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:92:61",
-      "ip": "10.69.1.154",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.154",
+      "mac": "00:09:3d:12:92:61",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:92:62",
-      "ip": "10.69.1.54",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.54",
+      "mac": "00:09:3d:12:92:62",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-54.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-54.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.json
index 86daf54ad9c..e3f83986d6a 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-55",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:68:a9",
-      "ip": "10.69.1.155",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.155",
+      "mac": "00:09:3d:12:68:a9",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:68:aa",
-      "ip": "10.69.1.55",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.55",
+      "mac": "00:09:3d:12:68:aa",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-55.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-55.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.json
index 8d38eab5ea9..1730c6f0dea 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-56",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:5a:d6",
-      "ip": "10.69.1.156",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.156",
+      "mac": "00:09:3d:12:5a:d6",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:5a:d7",
-      "ip": "10.69.1.56",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.56",
+      "mac": "00:09:3d:12:5a:d7",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-56.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-56.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.json
index 98c8b953e7a..d39f08684b9 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-57",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:62:ee",
-      "ip": "10.69.1.157",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.157",
+      "mac": "00:09:3d:12:62:ee",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:62:ef",
-      "ip": "10.69.1.57",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.57",
+      "mac": "00:09:3d:12:62:ef",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-57.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-57.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-57"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.json
index fe3a982ca4d..7a6f2ba1692 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-58",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:68:67",
-      "ip": "10.69.1.158",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.158",
+      "mac": "00:09:3d:12:68:67",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:68:68",
-      "ip": "10.69.1.58",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.58",
+      "mac": "00:09:3d:12:68:68",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-58.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-58.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-58"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.json
index bfd214d34a2..c9c6b9a9a93 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-59",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:29:f8",
-      "ip": "10.69.1.159",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.159",
+      "mac": "00:09:3d:12:29:f8",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:29:f9",
-      "ip": "10.69.1.59",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.59",
+      "mac": "00:09:3d:12:29:f9",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-59.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-59.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-59"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
index e2b27b1b149..7fbfd046ad6 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-6",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:3e:ea",
-      "ip": "10.69.1.106",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.106",
+      "mac": "00:09:3d:12:3e:ea",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:3e:eb",
-      "ip": "10.69.1.6",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.6",
+      "mac": "00:09:3d:12:3e:eb",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-6.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-6.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.json
index 0be930211e6..7dd40eb61a0 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-60",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:6b:3b",
-      "ip": "10.69.1.160",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.160",
+      "mac": "00:09:3d:12:6b:3b",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:6b:3c",
-      "ip": "10.69.1.60",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.60",
+      "mac": "00:09:3d:12:6b:3c",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-60.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-60.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-60"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.json
index bd8f5c73a6c..6f4aff765e5 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-61",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:5d:fa",
-      "ip": "10.69.1.161",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.161",
+      "mac": "00:09:3d:12:5d:fa",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:5d:fb",
-      "ip": "10.69.1.61",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.61",
+      "mac": "00:09:3d:12:5d:fb",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-61.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-61.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-61"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.json
index 7df28d30a43..7285b68de0a 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-62",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.162",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.162",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.62",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.62",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-62.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-62.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-62"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.json
index 5046933c572..440126e563d 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-63",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:5e:fb",
-      "ip": "10.69.1.163",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.163",
+      "mac": "00:09:3d:12:5e:fb",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:5e:fc",
-      "ip": "10.69.1.63",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.63",
+      "mac": "00:09:3d:12:5e:fc",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-63.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-63.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-63"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.json
index 541fcb3ee37..56287097e0d 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-64",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:31:7c",
-      "ip": "10.69.1.164",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.164",
+      "mac": "00:09:3d:12:31:7c",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:31:7d",
-      "ip": "10.69.1.64",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.64",
+      "mac": "00:09:3d:12:31:7d",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-64.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-64.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-64"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.json
index 1473a7029ae..d63d2acb597 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-65",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:28:01",
-      "ip": "10.69.1.165",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.165",
+      "mac": "00:09:3d:12:28:01",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:28:02",
-      "ip": "10.69.1.65",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.65",
+      "mac": "00:09:3d:12:28:02",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-65.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-65.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-65"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.json
index 7e782e288fb..0fe27419d37 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-66",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:30:5e",
-      "ip": "10.69.1.166",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.166",
+      "mac": "00:09:3d:12:30:5e",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:30:5f",
-      "ip": "10.69.1.66",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.66",
+      "mac": "00:09:3d:12:30:5f",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-66.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-66.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-66"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.json
index fae684e9d20..61c6f32ed68 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-67",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.167",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.167",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.67",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.67",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-67.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-67.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-67"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.json
index c065b177c8d..c9ee03485e0 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-68",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:27:f8",
-      "ip": "10.69.1.168",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.168",
+      "mac": "00:09:3d:12:27:f8",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:27:f9",
-      "ip": "10.69.1.68",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.68",
+      "mac": "00:09:3d:12:27:f9",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-68.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-68.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-68"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.json
index 18620ad4c04..8f0c67beec5 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-69",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.169",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.169",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.69",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.69",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-69.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-69.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-69"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
index 2131e65e234..8e6373bdd8c 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-7",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:7f:e9",
-      "ip": "10.69.1.107",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.107",
+      "mac": "00:09:3d:12:7f:e9",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:12:7f:ea",
-      "ip": "10.69.1.7",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.7",
+      "mac": "00:09:3d:12:7f:ea",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-7.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-7.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.json
index 2d8f159a6a8..454a7e6a3e1 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-70",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.170",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.170",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.70",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.70",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-70.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-70.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-70"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.json
index 5aeccab1f55..fd8017817f2 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-71",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:11:db:b1",
-      "ip": "10.69.1.171",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.171",
+      "mac": "00:09:3d:11:db:b1",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:11:db:b2",
-      "ip": "10.69.1.71",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.71",
+      "mac": "00:09:3d:11:db:b2",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-71.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-71.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-71"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.json
index a7e45b2790d..577d035879c 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-72",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:11:ae:fc",
-      "ip": "10.69.1.172",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.172",
+      "mac": "00:09:3d:11:ae:fc",
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": "00:09:3d:11:ae:fd",
-      "ip": "10.69.1.72",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.72",
+      "mac": "00:09:3d:11:ae:fd",
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-72.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-72.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-72"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.json
index c43141d4b92..14b383b025f 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-73",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.173",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.173",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.73",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.73",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-73.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-73.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-73"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json
index 4302fb35ef7..f9b64efe383 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-74",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.174",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.174",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.74",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.74",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-74.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-74.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-74"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.json
index c04d0b304da..bbefbdb6dd9 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-75",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.175",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.175",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.75",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.75",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-75.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-75.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-75"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.json
index df02fe52f0b..0aaa3956322 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-76",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.176",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.176",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.76",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.76",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-76.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-76.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-76"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.json
index 51289e9c226..02c7503ecf4 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-77",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.177",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.177",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.77",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.77",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-77.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-77.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-77"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.json
index f83b267481a..c2f4e4b0e29 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-78",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.178",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.178",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.78",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.78",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-78.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-78.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-78"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.json
index 863c4826bf2..83b98286a23 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-79",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.179",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.179",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.79",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.79",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-79.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-79.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-79"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.json
index 7d3ac9ce732..bfbfc34e14c 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-8",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.108",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.108",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.8",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.8",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-8.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-8.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.json
index 31b77e52f9a..b752603ec54 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "sagittaire-9",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,45 +10,64 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.109",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.109",
+      "mac": null,
       "management": false,
-      "driver": "tg3",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": false
+      "mountable": true,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Broadcom"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "10.69.1.9",
+      "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "10.69.1.9",
+      "mac": null,
       "management": false,
-      "switch": "little-ego",
-      "driver": "tg3",
-      "network_address": "sagittaire-9.lyon.grid5000.fr",
-      "mountable": true,
       "model": "BCM5704",
-      "mounted": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "sagittaire-9.lyon.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "little-ego",
+      "vendor": "Broadcom"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "sagittaire-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json b/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
index 26dee553244..cd82c45d449 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
-  "uid": "sagittaire",
+  "created_at": "Sat, 01 Jul 2006 12:00:00 GMT",
   "model": "Sun Fire V20z",
-  "created_at": "Sat, 01 Jul 2006 12:00:00 GMT"
+  "type": "cluster",
+  "uid": "sagittaire"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/lyon.json b/data/grid5000/sites/lyon/lyon.json
index 8bc8767bf3a..25a84f5cdea 100755
--- a/data/grid5000/sites/lyon/lyon.json
+++ b/data/grid5000/sites/lyon/lyon.json
@@ -1,14 +1,14 @@
 {
-  "type": "site",
-  "user_support_contact": null,
+  "description": "",
+  "email_contact": null,
   "latitude": 45.7667,
-  "uid": "lyon",
+  "location": "Lyon, France",
   "longitude": 4.8333,
-  "email_contact": null,
-  "sys_admin_contact": null,
   "name": "Lyon",
-  "location": "Lyon, France",
-  "description": "",
   "security_contact": null,
+  "sys_admin_contact": null,
+  "type": "site",
+  "uid": "lyon",
+  "user_support_contact": null,
   "web": null
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/gdx.json b/data/grid5000/sites/orsay/clusters/gdx/gdx.json
index 6c760ffe401..1834abf42b9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/gdx.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/gdx.json
@@ -1,7 +1,7 @@
 {
-  "type": "cluster",
+  "created_at": null,
   "misc": "bios:1.28/bcm:1.20.17/bmc:1.10/rsaII:1.00",
-  "uid": "gdx",
   "model": "IBM eServer 326m",
-  "created_at": null
+  "type": "cluster",
+  "uid": "gdx"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
index 292baa5103e..c1b84e55658 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-1",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.68.1",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.68.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-1-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-1-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.1.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.1.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.128.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.128.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-1-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-1-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
index d1f7361ea38..61a1463eb2d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-10",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.68.10",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.68.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-10-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-10-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.1.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.1.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-10.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-10.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.128.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.128.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-10-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-10-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
index bbefaf93746..5c8e9704012 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-100",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.76.28",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.76.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-100-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-100-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.9.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.9.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-100.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-100.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.136.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.136.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-100-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-100-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-100"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
index 01941543fa8..206cfce4d6c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-101",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.76.29",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.76.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-101-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-101-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.9.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.9.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-101.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-101.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.136.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.136.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-101-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-101-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-101"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
index 13416ff7ad9..d2689d9bfbe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-102",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.76.30",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.76.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-102-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-102-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.9.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.9.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-102.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-102.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.136.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.136.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-102-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-102-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-102"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
index 21ce0ee785a..af6d0cc3492 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-103",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.76.31",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.76.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-103-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-103-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.9.31",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.9.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-103.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-103.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.136.31",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.136.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-103-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-103-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-103"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
index c9c486bf2f6..0a40f66ba7a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-104",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.76.32",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.76.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-104-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-104-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.9.32",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.9.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-104.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-104.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.136.32",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.136.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-104-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-104-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-104"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
index 998eb5536a0..b8a14948e09 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-105",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.76.33",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.76.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-105-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-105-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.9.33",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.9.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-105.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-105.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.136.33",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.136.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-105-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-105-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-105"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
index d3adce88eec..abab9b653aa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-106",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.76.34",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.76.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-106-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-106-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.9.34",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.9.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-106.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-106.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.136.34",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.136.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-106-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-106-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-106"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
index 2c810c1c42d..7c493253081 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-107",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.76.35",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.76.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-107-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-107-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.9.35",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.9.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-107.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-107.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.136.35",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.136.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-107-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-107-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-107"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
index b8105a073aa..fa843e48f66 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-108",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.76.36",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.76.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-108-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-108-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.9.36",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.9.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-108.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-108.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.136.36",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.136.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-108-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-108-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-108"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
index b97c37488f8..392c0167b82 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-109",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.77.1",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.77.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-109-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-109-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.10.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.10.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-109.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-109.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.137.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.137.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-109-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-109-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-109"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
index dd1a2b0d729..d7162e18532 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-11",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.68.11",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.68.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-11-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-11-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.1.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.1.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-11.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-11.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.128.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.128.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-11-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-11-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
index 53835b56c7b..590617582ba 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-110",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.77.2",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.77.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-110-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-110-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.10.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.10.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-110.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-110.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.137.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.137.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-110-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-110-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-110"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
index ea8c22f21f2..e05281dc08b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-111",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.77.3",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.77.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-111-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-111-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.10.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.10.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-111.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-111.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.137.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.137.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-111-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-111-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-111"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
index 0a0af2bb91d..1692141a7e0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-112",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.77.4",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.77.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-112-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-112-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.10.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.10.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-112.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-112.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.137.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.137.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-112-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-112-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-112"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
index 6f11a7292a3..1fbfbda6eb8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-113",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.77.5",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.77.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-113-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-113-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.10.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.10.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-113.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-113.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.137.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.137.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-113-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-113-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-113"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
index ccaf500ef36..1cc69eee277 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-114",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.77.6",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.77.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-114-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-114-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.10.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.10.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-114.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-114.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.137.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.137.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-114-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-114-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-114"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
index cd3dd16e31b..febd139a860 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-115",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.77.7",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.77.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-115-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-115-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.10.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.10.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-115.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-115.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.137.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.137.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-115-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-115-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-115"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
index 059bf3c11ae..56fec61f6fe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-116",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.77.8",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.77.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-116-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-116-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.10.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.10.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-116.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-116.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.137.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.137.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-116-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-116-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-116"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
index ba5ad316d74..ea716d44165 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-117",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.77.9",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.77.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-117-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-117-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.10.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.10.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-117.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-117.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.137.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.137.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-117-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-117-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-117"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
index 0e10487f9b0..37f8581f13d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-118",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.77.10",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.77.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-118-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-118-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.10.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.10.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-118.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-118.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.137.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.137.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-118-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-118-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-118"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
index 192e7342fad..1a3571565fe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-119",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.77.11",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.77.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-119-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-119-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.10.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.10.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-119.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-119.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.137.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.137.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-119-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-119-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-119"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
index d750918ef73..ca138eae2e8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-12",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.68.12",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.68.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-12-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-12-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.1.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.1.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-12.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-12.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.128.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.128.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-12-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-12-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
index 13cf82f1a24..ce7414d52f2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-120",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.77.12",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.77.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-120-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-120-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.10.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.10.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-120.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-120.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.137.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.137.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-120-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-120-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-120"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
index fbac2bb5ee1..f4adb2338a8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-121",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.78.13",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.78.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-121-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-121-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.11.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.11.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-121.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-121.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.138.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.138.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-121-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-121-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-121"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
index a6503d77206..facfe9b2937 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-122",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.78.14",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.78.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-122-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-122-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.11.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.11.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-122.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-122.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.138.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.138.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-122-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-122-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-122"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
index 13a2f60149e..ce5ad688cf0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-123",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.78.15",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.78.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-123-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-123-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.11.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.11.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-123.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-123.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.138.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.138.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-123-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-123-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-123"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
index 484e51b0a52..22e61752e80 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-124",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.78.16",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.78.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-124-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-124-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.11.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.11.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-124.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-124.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.138.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.138.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-124-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-124-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-124"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
index fffb674358e..38e94f05c12 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-125",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.78.17",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.78.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-125-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-125-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.11.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.11.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-125.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-125.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.138.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.138.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-125-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-125-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-125"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
index 1701c976b2d..e2049790a0e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-126",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.78.18",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.78.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-126-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-126-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.11.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.11.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-126.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-126.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.138.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.138.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-126-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-126-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-126"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
index 2a2fa6f5811..80536047bd8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-127",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.78.19",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.78.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-127-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-127-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.11.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.11.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-127.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-127.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.138.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.138.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-127-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-127-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-127"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
index c89bb96f5e5..9fb325d1a1f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-128",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.78.20",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.78.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-128-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-128-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.11.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.11.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-128.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-128.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.138.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.138.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-128-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-128-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-128"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
index ae8a54f8f79..1d2700cf54c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-129",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.78.21",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.78.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-129-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-129-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.11.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.11.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-129.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-129.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.138.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.138.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-129-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-129-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-129"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
index cfdac6719e2..850d4be6f7b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-13",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.69.13",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.69.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-13-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-13-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.2.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.2.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-13.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-13.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.129.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.129.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-13-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-13-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
index af8fdbf3d66..ead5e94f925 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-130",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.78.22",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.78.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-130-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-130-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.11.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.11.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-130.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-130.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.138.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.138.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-130-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-130-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-130"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
index e8edf4a0f18..bac4c03b5b9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-131",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.78.23",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.78.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-131-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-131-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.11.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.11.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-131.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-131.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.138.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.138.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-131-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-131-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-131"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
index e3074559e3c..c17bb2e5ca3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-132",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.78.24",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.78.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-132-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-132-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.11.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.11.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-132.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-132.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.138.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.138.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-132-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-132-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-132"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
index e5cc4ab28aa..dd4266affc8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-133",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.79.25",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.79.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-133-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-133-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.12.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.12.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-133.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-133.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.139.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.139.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-133-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-133-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-133"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
index de6c389118c..421cb215e09 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-134",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.79.26",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.79.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-134-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-134-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.12.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.12.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-134.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-134.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.139.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.139.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-134-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-134-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-134"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
index 1e0f353bd60..d56158a6b6f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-135",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.79.27",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.79.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-135-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-135-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.12.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.12.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-135.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-135.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.139.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.139.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-135-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-135-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-135"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
index 6494651a477..17e5a52cc07 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-136",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.79.28",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.79.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-136-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-136-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.12.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.12.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-136.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-136.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.139.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.139.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-136-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-136-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-136"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
index dfbc8c7fea0..f8ac533362b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-137",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.79.29",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.79.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-137-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-137-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.12.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.12.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-137.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-137.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.139.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.139.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-137-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-137-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-137"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
index 535bf1b745f..20764e3a362 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-138",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.79.30",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.79.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-138-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-138-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.12.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.12.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-138.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-138.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.139.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.139.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-138-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-138-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-138"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
index dc9c372c2fb..788424d3a7f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-139",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.79.31",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.79.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-139-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-139-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.12.31",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.12.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-139.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-139.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.139.31",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.139.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-139-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-139-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-139"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
index 93664ef3253..6ba6e5e3d58 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-14",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.69.14",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.69.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-14-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-14-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.2.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.2.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-14.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-14.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.129.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.129.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-14-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-14-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
index 7555135af7d..80709588b18 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-140",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.79.32",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.79.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-140-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-140-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.12.32",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.12.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-140.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-140.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.139.32",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.139.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-140-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-140-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-140"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
index 56c97fd9760..4741f88dd7e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-141",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.79.33",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.79.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-141-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-141-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.12.33",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.12.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-141.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-141.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.139.33",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.139.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-141-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-141-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-141"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
index 54ad60218e6..8b6545e6432 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-142",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.79.34",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.79.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-142-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-142-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.12.34",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.12.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-142.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-142.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.139.34",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.139.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-142-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-142-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-142"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
index d84ba300be3..781fd361ab2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-143",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.79.35",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.79.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-143-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-143-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.12.35",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.12.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-143.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-143.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.139.35",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.139.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-143-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-143-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-143"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
index efbb1acdefc..0cbce61faa2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-144",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.79.36",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.79.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-144-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-144-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.12.36",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.12.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-144.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-144.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.139.36",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.139.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-144-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-144-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-144"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
index e399b681e32..1be1e25b338 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-145",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.80.1",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.80.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-145-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-145-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.13.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.13.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-145.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-145.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.140.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.140.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-145-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-145-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-145"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
index eefb4ef31c0..4939bf4a60f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-146",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.80.2",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.80.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-146-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-146-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.13.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.13.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-146.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-146.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.140.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.140.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-146-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-146-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-146"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
index 43f77a41653..026de8d040f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-147",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.80.3",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.80.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-147-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-147-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.13.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.13.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-147.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-147.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.140.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.140.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-147-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-147-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-147"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
index c733717b6f0..a1a1f7b0a37 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-148",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.80.4",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.80.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-148-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-148-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.13.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.13.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-148.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-148.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.140.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.140.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-148-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-148-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-148"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
index 1fb5d89bd25..fd498a8a86e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-149",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.80.5",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.80.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-149-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-149-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.13.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.13.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-149.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-149.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.140.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.140.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-149-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-149-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-149"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
index 8353d83d7f9..5e3eb6e4a39 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-15",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.69.15",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.69.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-15-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-15-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.2.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.2.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-15.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-15.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.129.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.129.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-15-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-15-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
index a242a373b72..1c88014aab3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-150",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.80.6",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.80.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-150-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-150-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.13.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.13.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-150.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-150.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.140.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.140.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-150-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-150-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-150"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
index 49d98cc4dae..1dd54102571 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-151",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.80.7",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.80.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-151-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-151-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.13.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.13.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-151.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-151.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.140.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.140.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-151-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-151-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-151"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
index d119190eef1..05cbddc95c8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-152",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.80.8",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.80.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-152-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-152-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.13.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.13.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-152.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-152.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.140.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.140.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-152-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-152-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-152"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
index 39b32e788ef..803015fdae3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-153",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.80.9",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.80.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-153-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-153-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.13.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.13.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-153.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-153.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.140.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.140.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-153-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-153-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-153"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
index 20c75f60f39..725352a791a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-154",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.80.10",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.80.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-154-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-154-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.13.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.13.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-154.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-154.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.140.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.140.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-154-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-154-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-154"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
index ad7366bb3ef..978e218cca1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-155",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.80.11",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.80.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-155-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-155-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.13.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.13.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-155.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-155.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.140.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.140.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-155-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-155-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-155"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
index 389046770f6..9282081e696 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-156",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.80.12",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.80.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-156-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-156-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.13.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.13.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-156.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-156.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.140.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.140.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-156-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-156-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-156"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
index ef721b656c1..2756dffc28f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-157",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.81.13",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.81.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-157-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-157-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.14.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.14.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-157.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-157.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.141.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.141.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-157-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-157-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-157"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
index 4f56a310bdb..6f8c9d4e256 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-158",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.81.14",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.81.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-158-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-158-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.14.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.14.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-158.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-158.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.141.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.141.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-158-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-158-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-158"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
index 8d1fb7fa0ee..03b195582b8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-159",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.81.15",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.81.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-159-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-159-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.14.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.14.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-159.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-159.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.141.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.141.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-159-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-159-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-159"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
index 7e5fce1d711..98d0c71bbe8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-16",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.69.16",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.69.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-16-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-16-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.2.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.2.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-16.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-16.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.129.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.129.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-16-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-16-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
index 3fdd168d032..27ea9543ad8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-160",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.81.16",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.81.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-160-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-160-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.14.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.14.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-160.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-160.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.141.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.141.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-160-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-160-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-160"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
index 290096e3fd0..0a77a4e9d02 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-161",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.81.17",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.81.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-161-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-161-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.14.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.14.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-161.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-161.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.141.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.141.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-161-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-161-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-161"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
index 24ff7e3e87c..07f8992a665 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-162",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.81.18",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.81.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-162-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-162-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.14.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.14.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-162.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-162.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.141.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.141.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-162-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-162-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-162"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
index 80bc47806a3..128d5a728e1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-163",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.81.19",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.81.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-163-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-163-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.14.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.14.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-163.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-163.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.141.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.141.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-163-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-163-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-163"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
index c5e55f91f7d..5956c29ec39 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-164",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.81.20",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.81.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-164-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-164-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.14.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.14.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-164.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-164.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.141.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.141.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-164-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-164-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-164"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
index ca530e78914..e4120bbac7a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-165",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.81.21",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.81.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-165-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-165-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.14.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.14.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-165.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-165.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.141.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.141.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-165-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-165-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-165"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
index 644e8d72782..f106fbf148c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-166",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.81.22",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.81.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-166-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-166-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.14.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.14.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-166.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-166.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.141.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.141.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-166-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-166-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-166"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
index c116c0a2014..e795652ebed 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-167",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.81.23",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.81.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-167-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-167-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.14.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.14.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-167.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-167.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.141.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.141.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-167-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-167-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-167"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
index c8b264308bb..8dfd4b4f246 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-168",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.81.24",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.81.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-168-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-168-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.14.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.14.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-168.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-168.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.141.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.141.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-168-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-168-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-168"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
index 55df36d7a5b..646421e3bd0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-169",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.82.25",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.82.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-169-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-169-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.15.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.15.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-169.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-169.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.142.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.142.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-169-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-169-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-169"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
index bf7e4b5b805..31051b587cd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-17",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.69.17",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.69.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-17-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-17-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.2.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.2.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-17.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-17.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.129.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.129.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-17-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-17-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
index 6f26e0f83a0..41430620107 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-170",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.82.26",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.82.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-170-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-170-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.15.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.15.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-170.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-170.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.142.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.142.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-170-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-170-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-170"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
index d6ea3437654..66c91b80a66 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-171",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.82.27",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.82.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-171-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-171-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.15.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.15.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-171.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-171.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.142.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.142.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-171-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-171-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-171"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
index c1aeea0037a..83c27581973 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-172",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.82.28",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.82.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-172-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-172-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.15.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.15.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-172.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-172.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.142.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.142.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-172-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-172-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-172"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
index 3af4f00ff3a..595dfdc7076 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-173",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.82.29",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.82.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-173-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-173-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.15.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.15.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-173.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-173.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.142.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.142.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-173-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-173-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-173"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
index 404beb18595..693bdb2beef 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-174",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.82.30",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.82.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-174-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-174-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.15.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.15.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-174.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-174.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.142.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.142.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-174-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-174-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-174"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
index d8d51798aab..82011914b1f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-175",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.82.31",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.82.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-175-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-175-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.15.31",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.15.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-175.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-175.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.142.31",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.142.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-175-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-175-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-175"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
index 266adf9e604..3e37e6fa4d4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-176",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.82.32",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.82.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-176-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-176-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.15.32",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.15.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-176.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-176.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.142.32",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.142.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-176-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-176-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-176"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
index d78b2460148..4a07f2b1e79 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-177",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.82.33",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.82.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-177-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-177-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.15.33",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.15.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-177.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-177.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.142.33",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.142.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-177-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-177-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-177"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
index 8c773aaf7e1..43f15e7050a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-178",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.82.34",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.82.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-178-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-178-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.15.34",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.15.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-178.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-178.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.142.34",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.142.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-178-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-178-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-178"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
index 4f71f134039..3911cbb026c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-179",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.82.35",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.82.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-179-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-179-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.15.35",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.15.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-179.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-179.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.142.35",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.142.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-179-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-179-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-179"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
index 0e2b942b8e7..358afa4265f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-18",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.69.18",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.69.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-18-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-18-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.2.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.2.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-18.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-18.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.129.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.129.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-18-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-18-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
index b1a5f60e8a9..3f58f2787d6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-180",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.82.36",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.82.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-180-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-180-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.15.36",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.15.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-180.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-180.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.142.36",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.142.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-180-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-180-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-180"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
index 6a1d35b18d5..061ea200689 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-181",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.83.1",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.83.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-181-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-181-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.16.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.16.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-181.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-181.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.143.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.143.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-181-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-181-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-181"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
index 52a310f9451..2addc78d2c1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-182",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.83.2",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.83.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-182-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-182-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.16.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.16.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-182.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-182.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.143.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.143.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-182-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-182-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-182"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
index f9e02b732d9..df8864c58a0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-183",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.83.3",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.83.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-183-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-183-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.16.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.16.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-183.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-183.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.143.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.143.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-183-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-183-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-183"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
index aa3c10169fe..3ca429b5e1b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-184",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.83.4",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.83.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-184-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-184-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.16.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.16.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-184.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-184.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.143.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.143.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-184-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-184-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-184"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
index 662e4275260..ab69b1d0586 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-185",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.83.5",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.83.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-185-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-185-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.16.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.16.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-185.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-185.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.143.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.143.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-185-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-185-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-185"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
index 83e9afebd40..dd17465c694 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-186",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.83.6",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.83.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-186-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-186-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.16.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.16.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-186.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-186.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.143.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.143.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-186-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-186-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-186"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
index 0e80d062d09..392162c94ad 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-187",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.83.7",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.83.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-187-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-187-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.16.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.16.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-187.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-187.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.143.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.143.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-187-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-187-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-187"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
index 85ce0ced274..396f32a6c4d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-188",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.83.8",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.83.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-188-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-188-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.16.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.16.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-188.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-188.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.143.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.143.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-188-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-188-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-188"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
index 1f980f85c55..684513ff244 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-189",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.83.9",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.83.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-189-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-189-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.16.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.16.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-189.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-189.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.143.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.143.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-189-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-189-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-189"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
index 3c132b430d1..87399b64611 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-19",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.69.19",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.69.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-19-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-19-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.2.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.2.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-19.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-19.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.129.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.129.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-19-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-19-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
index 0c05eb62e2d..61779993300 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-190",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.83.10",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.83.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-190-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-190-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.16.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.16.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-190.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-190.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.143.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.143.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-190-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-190-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-190"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
index d11ef081133..1a077912027 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-191",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.83.11",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.83.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-191-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-191-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.16.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.16.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-191.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-191.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.143.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.143.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-191-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-191-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-191"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
index 4c4a1fb6f32..17255f61f44 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-192",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.83.12",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.83.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-192-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-192-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.16.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.16.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-192.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-192.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.143.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.143.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-192-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-192-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-192"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
index 820dafa498a..c7a1f533d37 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-193",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.84.13",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.84.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-193-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-193-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.17.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.17.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-193.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-193.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.144.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.144.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-193-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-193-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-193"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
index 3b049a2bd61..18775058fea 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-194",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.84.14",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.84.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-194-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-194-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.17.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.17.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-194.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-194.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.144.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.144.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-194-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-194-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-194"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
index e9e7a0009f5..b442356d027 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-195",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.84.15",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.84.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-195-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-195-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.17.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.17.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-195.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-195.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.144.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.144.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-195-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-195-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-195"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
index 6afafe99554..2877590c9db 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-196",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.84.16",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.84.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-196-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-196-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.17.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.17.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-196.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-196.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.144.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.144.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-196-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-196-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-196"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
index 4fc12282ba5..3ddb5cfac5e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-197",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.84.17",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.84.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-197-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-197-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.17.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.17.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-197.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-197.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.144.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.144.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-197-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-197-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-197"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
index 73f78e46b01..421fd1b47bf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-198",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.84.18",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.84.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-198-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-198-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.17.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.17.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-198.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-198.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.144.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.144.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-198-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-198-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-198"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
index 52c3caf287b..c1b04d1ddc9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-199",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.84.19",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.84.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-199-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-199-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.17.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.17.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-199.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-199.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.144.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.144.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-199-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-199-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-199"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
index 41ab15844ef..7b0b76b2c72 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-2",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.68.2",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.68.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-2-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-2-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.1.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.1.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.128.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.128.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-2-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-2-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
index 1d50ec26237..8d24e1b08db 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-20",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.69.20",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.69.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-20-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-20-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.2.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.2.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-20.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-20.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.129.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.129.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-20-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-20-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
index eddb2165b59..b6b691cd31d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-200",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.84.20",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.84.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-200-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-200-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.17.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.17.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-200.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-200.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.144.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.144.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-200-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-200-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-200"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
index a50a1751c2b..7ff57311f54 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-201",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.84.21",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.84.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-201-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-201-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.17.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.17.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-201.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-201.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.144.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.144.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-201-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-201-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-201"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
index ea697edf446..1188c4cde57 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-202",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.84.22",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.84.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-202-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-202-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.17.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.17.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-202.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-202.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.144.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.144.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-202-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-202-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-202"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
index 162db753df9..33624cbb976 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-203",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.84.23",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.84.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-203-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-203-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.17.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.17.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-203.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-203.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.144.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.144.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-203-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-203-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-203"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
index 81b194a6d0c..deec02ef198 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-204",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.84.24",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.84.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-204-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-204-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.17.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.17.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-204.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-204.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.144.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.144.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-204-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-204-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-204"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
index ab8a33dd01c..512a9dbd67d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-205",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.85.25",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.85.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-205-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-205-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.18.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.18.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-205.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-205.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.145.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.145.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-205-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-205-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-205"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
index 5eb9f578023..51437f4c749 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-206",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.85.26",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.85.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-206-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-206-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.18.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.18.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-206.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-206.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.145.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.145.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-206-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-206-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-206"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
index da670f593e2..af5dae16521 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-207",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.85.27",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.85.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-207-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-207-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.18.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.18.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-207.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-207.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.145.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.145.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-207-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-207-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-207"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
index 9168d771433..24b960e0a82 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-208",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.85.28",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.85.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-208-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-208-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.18.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.18.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-208.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-208.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.145.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.145.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-208-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-208-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-208"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
index 52e45c1bd49..6f6bba8c66c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-209",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.85.29",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.85.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-209-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-209-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.18.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.18.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-209.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-209.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.145.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.145.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-209-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-209-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-209"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
index aafe292f419..6a923e51872 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-21",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.69.21",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.69.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-21-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-21-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.2.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.2.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-21.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-21.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.129.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.129.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-21-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-21-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
index 668214faf77..81aa5ade590 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-210",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.85.30",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.85.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-210-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-210-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.18.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.18.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-210.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-210.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.145.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.145.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-210-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-210-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-210"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
index 87e8547637a..0c7a81f1e86 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-211",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.85.31",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.85.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-211-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-211-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.18.31",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.18.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-211.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-211.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.145.31",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.145.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-211-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-211-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-211"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
index f3077164b40..56827a30c58 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-212",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.85.32",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.85.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-212-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-212-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.18.32",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.18.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-212.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-212.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.145.32",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.145.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-212-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-212-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-212"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
index 087d85c5f73..c04ae686307 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-213",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.85.33",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.85.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-213-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-213-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.18.33",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.18.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-213.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-213.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.145.33",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.145.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-213-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-213-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-213"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
index 5cb1c9a593b..34e9fd70d4d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-214",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.85.34",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.85.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-214-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-214-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.18.34",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.18.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-214.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-214.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.145.34",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.145.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-214-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-214-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-214"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
index a4fd79cabe9..3095e6aeded 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-215",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.85.35",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.85.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-215-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-215-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.18.35",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.18.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-215.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-215.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.145.35",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.145.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-215-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-215-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-215"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
index 8e855f5e756..8e693bf2c01 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-216",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.85.36",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.85.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-216-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-216-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.18.36",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.18.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-216.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-216.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.145.36",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.145.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-216-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-216-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-216"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
index ea58c826068..d67cdf49809 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-217",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.86.1",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.86.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-217-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-217-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.19.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.19.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-217.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-217.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.146.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.146.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-217-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-217-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-217"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
index 16188305373..c32c1a5defa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-218",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.86.2",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.86.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-218-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-218-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.19.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.19.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-218.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-218.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.146.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.146.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-218-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-218-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-218"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
index 9428e1e0eb6..81f02f47b3b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-219",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.86.3",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.86.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-219-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-219-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.19.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.19.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-219.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-219.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.146.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.146.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-219-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-219-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-219"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
index 041628423ac..89b2f9fc80a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-22",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.69.22",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.69.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-22-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-22-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.2.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.2.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-22.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-22.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.129.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.129.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-22-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-22-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
index 2f081e4196d..34a88674dc2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-220",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.86.4",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.86.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-220-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-220-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.19.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.19.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-220.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-220.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.146.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.146.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-220-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-220-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-220"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
index d605dfcc8e6..6744dc03535 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-221",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.86.5",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.86.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-221-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-221-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.19.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.19.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-221.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-221.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.146.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.146.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-221-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-221-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-221"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
index c55a63cd67b..884b92e8961 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-222",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.86.6",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.86.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-222-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-222-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.19.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.19.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-222.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-222.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.146.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.146.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-222-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-222-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-222"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
index 8809bd91c8d..2e206fd0358 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-223",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.86.7",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.86.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-223-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-223-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.19.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.19.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-223.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-223.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.146.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.146.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-223-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-223-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-223"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
index eed4393e273..d0e8b45bc3c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-224",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.86.8",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.86.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-224-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-224-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.19.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.19.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-224.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-224.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.146.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.146.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-224-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-224-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-224"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
index b37c4e84fa5..31cb5a46a94 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-225",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.86.9",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.86.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-225-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-225-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.19.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.19.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-225.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-225.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.146.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.146.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-225-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-225-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-225"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
index 28e7cf636e4..6901dc1bf35 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-226",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.86.10",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.86.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-226-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-226-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.19.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.19.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-226.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-226.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.146.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.146.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-226-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-226-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-226"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
index 1815f935743..a416a4e32b2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-227",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.86.11",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.86.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-227-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-227-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.19.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.19.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-227.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-227.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.146.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.146.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-227-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-227-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-227"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
index 30962193137..e28fcaa8b6a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-228",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.86.12",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.86.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-228-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-228-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.19.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.19.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-228.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-228.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.146.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.146.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-228-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-228-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-228"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
index 5abde08f4ab..98e3bfa9163 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-229",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.87.13",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.87.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-229-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-229-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.20.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.20.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-229.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-229.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.147.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.147.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-229-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-229-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-229"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
index 16a704df597..c56cc6e70b3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-23",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.69.23",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.69.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-23-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-23-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.2.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.2.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-23.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-23.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.129.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.129.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-23-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-23-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
index fd9809a9659..e913f9f5c7c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-230",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.87.14",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.87.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-230-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-230-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.20.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.20.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-230.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-230.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.147.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.147.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-230-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-230-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-230"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
index 21e4259d53a..96f4883dd6d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-231",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.87.15",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.87.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-231-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-231-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.20.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.20.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-231.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-231.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.147.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.147.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-231-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-231-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-231"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
index d318d084e48..56e24fba6dd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-232",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.87.16",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.87.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-232-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-232-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.20.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.20.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-232.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-232.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.147.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.147.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-232-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-232-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-232"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
index 6d844253db5..5ae20e36b93 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-233",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.87.17",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.87.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-233-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-233-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.20.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.20.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-233.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-233.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.147.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.147.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-233-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-233-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-233"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
index d45f44c0ede..81f7b9e2e0b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-234",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.87.18",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.87.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-234-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-234-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.20.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.20.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-234.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-234.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.147.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.147.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-234-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-234-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-234"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
index 6fe0159428a..09bf38a3ab8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-235",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.87.19",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.87.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-235-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-235-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.20.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.20.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-235.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-235.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.147.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.147.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-235-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-235-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-235"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
index 12e7486b985..8383327f33b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-236",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.87.20",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.87.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-236-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-236-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.20.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.20.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-236.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-236.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.147.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.147.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-236-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-236-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-236"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
index 4dd1db863ca..8957cf84f23 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-237",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.87.21",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.87.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-237-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-237-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.20.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.20.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-237.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-237.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.147.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.147.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-237-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-237-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-237"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
index 0c28116eca3..e6161c1ee39 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-238",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.87.22",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.87.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-238-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-238-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.20.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.20.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-238.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-238.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.147.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.147.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-238-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-238-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-238"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
index e9cec4295e9..3f2123856db 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-239",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.87.23",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.87.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-239-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-239-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.20.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.20.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-239.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-239.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.147.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.147.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-239-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-239-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-239"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
index 0370e17b95d..e8277dc9c27 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-24",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.69.24",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.69.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-24-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-24-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.2.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.2.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-24.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-24.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.129.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.129.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-24-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-24-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
index 87ffa529e1a..e5dae353520 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-240",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.87.24",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.87.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-240-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-240-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.20.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.20.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-240.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-240.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.147.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.147.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-240-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-240-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-240"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
index cda859bf427..9dbdff694aa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-241",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.88.25",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.88.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-241-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-241-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.21.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.21.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-241.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-241.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.148.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.148.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-241-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-241-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-241"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
index 69ade5cf87f..030367c0257 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-242",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.88.26",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.88.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-242-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-242-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.21.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.21.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-242.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-242.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.148.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.148.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-242-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-242-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-242"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
index 8656485add9..fc5b6faed87 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-243",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.88.27",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.88.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-243-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-243-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.21.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.21.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-243.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-243.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.148.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.148.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-243-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-243-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-243"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
index df7dff57844..c7aef7543c0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-244",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.88.28",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.88.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-244-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-244-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.21.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.21.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-244.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-244.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.148.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.148.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-244-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-244-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-244"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
index dc63530a09a..dfce7e20b08 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-245",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.88.29",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.88.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-245-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-245-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.21.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.21.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-245.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-245.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.148.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.148.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-245-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-245-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-245"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
index 5b2c04f8e69..a8406d8a354 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-246",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.88.30",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.88.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-246-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-246-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.21.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.21.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-246.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-246.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.148.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.148.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-246-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-246-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-246"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
index 699c5ba553a..c4d02f05c9c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-247",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.88.31",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.88.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-247-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-247-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.21.31",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.21.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-247.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-247.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.148.31",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.148.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-247-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-247-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-247"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
index 26025005433..c92938fb94b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-248",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.88.32",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.88.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-248-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-248-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.21.32",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.21.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-248.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-248.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.148.32",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.148.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-248-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-248-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-248"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
index f9224153c06..ebdd8cadf56 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-249",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.88.33",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.88.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-249-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-249-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.21.33",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.21.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-249.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-249.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.148.33",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.148.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-249-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-249-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-249"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
index 4fbdb2f2a41..59adfcad69d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-25",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.70.25",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.70.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-25-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-25-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.3.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.3.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-25.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-25.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.130.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.130.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-25-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-25-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
index 30934ef09b3..6ba0516205f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-250",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.88.34",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.88.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-250-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-250-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.21.34",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.21.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-250.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-250.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.148.34",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.148.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-250-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-250-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-250"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
index 29fb230dc58..270d194ade6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-251",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.88.35",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.88.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-251-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-251-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.21.35",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.21.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-251.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-251.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.148.35",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.148.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-251-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-251-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-251"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
index 24a5c1dca82..a1f9e7a065c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-252",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.88.36",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.88.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-252-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-252-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.21.36",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.21.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-252.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-252.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.148.36",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.148.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-252-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-252-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-252"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
index 2f78c4bc2bf..70b19b6109c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-253",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.89.1",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.89.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-253-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-253-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.22.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.22.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-253.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-253.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.149.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.149.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-253-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-253-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-253"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
index fb690e2208f..8ae623af206 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-254",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.89.2",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.89.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-254-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-254-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.22.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.22.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-254.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-254.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.149.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.149.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-254-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-254-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-254"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
index 97b855753ff..212f9f52dd9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-255",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.89.3",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.89.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-255-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-255-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.22.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.22.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-255.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-255.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.149.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.149.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-255-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-255-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-255"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
index e90f9f26952..9c00de2de8f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-256",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.89.4",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.89.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-256-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-256-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.22.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.22.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-256.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-256.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.149.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.149.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-256-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-256-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-256"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
index e6a42f2e5b4..487dcff4659 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-257",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.89.5",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.89.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-257-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-257-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.22.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.22.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-257.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-257.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.149.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.149.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-257-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-257-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-257"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
index 6eef6451aae..ab197d08cfc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-258",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.89.6",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.89.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-258-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-258-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.22.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.22.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-258.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-258.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.149.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.149.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-258-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-258-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-258"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
index 6ee04369d3d..9e5976a3181 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-259",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.89.7",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.89.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-259-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-259-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.22.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.22.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-259.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-259.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.149.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.149.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-259-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-259-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-259"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
index d13c49873e0..bf359e02d76 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-26",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.70.26",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.70.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-26-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-26-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.3.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.3.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-26.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-26.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.130.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.130.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-26-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-26-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
index 2828473c62f..7298ed367c3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-260",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.89.8",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.89.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-260-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-260-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.22.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.22.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-260.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-260.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.149.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.149.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-260-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-260-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-260"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
index b620e107b3e..9ae4e3452d0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-261",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.89.9",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.89.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-261-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-261-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.22.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.22.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-261.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-261.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.149.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.149.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-261-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-261-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-261"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
index 96debe63658..aa84c685bdb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-262",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.89.10",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.89.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-262-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-262-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.22.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.22.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-262.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-262.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.149.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.149.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-262-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-262-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-262"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
index ea12c60e5d6..096a3ef3bad 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-263",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.89.11",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.89.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-263-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-263-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.22.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.22.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-263.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-263.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.149.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.149.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-263-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-263-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-263"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
index 095f41c9d89..a47092e425d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-264",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.89.12",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.89.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-264-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-264-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.22.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.22.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-264.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-264.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.149.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.149.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-264-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-264-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-264"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
index ce03cd32615..bb4af6fc35e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-265",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.90.13",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.90.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-265-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-265-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.23.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.23.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-265.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-265.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.150.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.150.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-265-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-265-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-265"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
index 3f66e9bdbd9..3e0e4628ae6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-266",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.90.14",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.90.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-266-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-266-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.23.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.23.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-266.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-266.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.150.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.150.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-266-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-266-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-266"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
index a3c9babbdad..a33f445ada4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-267",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.90.15",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.90.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-267-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-267-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.23.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.23.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-267.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-267.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.150.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.150.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-267-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-267-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-267"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
index d8ad5849816..85959e4db67 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-268",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.90.16",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.90.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-268-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-268-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.23.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.23.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-268.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-268.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.150.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.150.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-268-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-268-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-268"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
index 6208366876c..d57f019d223 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-269",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.90.17",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.90.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-269-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-269-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.23.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.23.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-269.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-269.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.150.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.150.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-269-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-269-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-269"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
index e1f76890a75..f7cf7e4da3e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-27",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.70.27",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.70.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-27-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-27-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.3.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.3.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-27.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-27.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.130.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.130.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-27-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-27-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
index 4884e7004e4..ccc6e303dae 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-270",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.90.18",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.90.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-270-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-270-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.23.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.23.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-270.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-270.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.150.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.150.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-270-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-270-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-270"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
index fce606402a4..c3f70f5ba01 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-271",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.90.19",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.90.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-271-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-271-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.23.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.23.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-271.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-271.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.150.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.150.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-271-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-271-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-271"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
index 1754614bae2..f816438baec 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-272",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.90.20",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.90.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-272-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-272-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.23.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.23.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-272.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-272.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.150.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.150.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-272-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-272-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-272"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
index 5d624fdf6ca..5594ded0552 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-273",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.90.21",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.90.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-273-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-273-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.23.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.23.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-273.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-273.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.150.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.150.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-273-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-273-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-273"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
index 5dc73e581a6..8f89d6ec5a8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-274",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.90.22",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.90.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-274-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-274-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.23.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.23.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-274.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-274.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.150.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.150.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-274-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-274-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-274"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
index 6b8e43642b9..96c28cf5404 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-275",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.90.23",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.90.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-275-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-275-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.23.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.23.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-275.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-275.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.150.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.150.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-275-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-275-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-275"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
index a603e19d9c1..b228325b2c4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-276",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.90.24",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.90.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-276-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-276-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.23.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.23.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-276.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-276.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.150.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.150.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-276-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-276-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-276"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
index b5b18f4dc79..2587c289911 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-277",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.91.25",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.91.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-277-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-277-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.24.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.24.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-277.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-277.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.151.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.151.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-277-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-277-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-277"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
index 583b1dda887..eb2595c9759 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-278",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.91.26",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.91.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-278-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-278-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.24.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.24.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-278.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-278.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.151.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.151.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-278-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-278-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-278"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
index 3cfd290fc6d..54f56d7652e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-279",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.91.27",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.91.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-279-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-279-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.24.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.24.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-279.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-279.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.151.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.151.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-279-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-279-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-279"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
index e30614c2d90..63302a86306 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-28",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.70.28",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.70.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-28-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-28-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.3.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.3.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-28.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-28.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.130.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.130.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-28-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-28-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
index 511f8d93a73..fed402288c2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-280",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.91.28",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.91.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-280-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-280-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.24.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.24.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-280.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-280.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.151.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.151.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-280-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-280-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-280"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
index f4dc8e9b404..20ecb968f94 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-281",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.91.29",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.91.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-281-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-281-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.24.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.24.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-281.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-281.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.151.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.151.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-281-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-281-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-281"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
index f01fb7a9828..413d1006c68 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-282",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.91.30",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.91.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-282-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-282-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.24.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.24.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-282.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-282.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.151.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.151.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-282-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-282-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-282"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
index 4b84616f659..b3ef1e3e486 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-283",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.91.31",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.91.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-283-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-283-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.24.31",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.24.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-283.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-283.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.151.31",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.151.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-283-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-283-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-283"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
index f88754de695..8d6a96f45d5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-284",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.91.32",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.91.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-284-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-284-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.24.32",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.24.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-284.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-284.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.151.32",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.151.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-284-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-284-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-284"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
index e2239de8c27..2e0120f1766 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-285",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.91.33",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.91.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-285-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-285-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.24.33",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.24.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-285.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-285.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.151.33",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.151.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-285-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-285-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-285"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
index fc0814f44af..3bf60c73b03 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-286",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.91.34",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.91.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-286-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-286-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.24.34",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.24.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-286.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-286.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.151.34",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.151.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-286-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-286-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-286"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
index 073ff89b33a..8709973d95d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-287",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.91.35",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.91.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-287-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-287-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.24.35",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.24.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-287.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-287.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.151.35",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.151.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-287-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-287-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-287"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
index e00072745e1..2f1f0501021 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-288",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.91.36",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.91.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-288-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-288-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.24.36",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.24.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-288.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-288.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.151.36",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.151.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-288-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-288-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-288"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
index d7d18b8c48f..5a7afd14f0a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-289",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.92.1",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.92.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-289-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-289-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.25.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.25.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-289.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-289.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.152.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.152.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-289-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-289-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-289"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
index 54dfe7162e9..d89c97da76d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-29",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.70.29",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.70.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-29-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-29-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.3.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.3.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-29.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-29.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.130.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.130.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-29-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-29-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
index e90d5c8a635..8c26eed639c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-290",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.92.2",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.92.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-290-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-290-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.25.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.25.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-290.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-290.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.152.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.152.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-290-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-290-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-290"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
index 33eb48bbb61..38c4d298cb6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-291",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.92.3",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.92.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-291-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-291-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.25.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.25.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-291.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-291.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.152.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.152.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-291-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-291-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-291"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
index b29ee36a2aa..cf6f6efe456 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-292",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.92.4",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.92.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-292-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-292-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.25.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.25.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-292.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-292.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.152.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.152.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-292-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-292-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-292"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
index 4f9d9b93ddd..21b98a11326 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-293",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.92.5",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.92.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-293-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-293-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.25.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.25.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-293.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-293.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.152.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.152.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-293-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-293-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-293"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
index cc7dbff32a2..7470fef7e2a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-294",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.92.6",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.92.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-294-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-294-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.25.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.25.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-294.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-294.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.152.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.152.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-294-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-294-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-294"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
index 18c528dddb2..02288e4e9bc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-295",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.92.7",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.92.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-295-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-295-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.25.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.25.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-295.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-295.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.152.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.152.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-295-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-295-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-295"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
index 8131528d628..da322e5b1fe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-296",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.92.8",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.92.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-296-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-296-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.25.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.25.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-296.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-296.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.152.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.152.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-296-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-296-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-296"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
index 15c28abee0f..f3f02b49dd8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-297",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.92.9",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.92.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-297-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-297-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.25.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.25.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-297.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-297.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.152.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.152.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-297-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-297-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-297"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
index 3ad04221e80..fd74a3d0505 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-298",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.92.10",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.92.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-298-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-298-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.25.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.25.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-298.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-298.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.152.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.152.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-298-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-298-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-298"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
index c10a2eabdb3..4df36ceb6b0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-299",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.92.11",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.92.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-299-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-299-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.25.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.25.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-299.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-299.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.152.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.152.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-299-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-299-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-299"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
index b2fe377c541..bc9adb5a45b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-3",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.68.3",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.68.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-3-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-3-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.1.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.1.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-3.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-3.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.128.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.128.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-3-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-3-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
index 4a7b36ea58b..ac99afc1a64 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-30",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.70.30",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.70.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-30-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-30-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.3.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.3.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-30.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-30.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.130.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.130.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-30-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-30-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
index 1e03750dc5c..1d41592d73d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-300",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.92.12",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.92.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-300-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-300-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.25.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.25.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-300.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-300.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.152.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.152.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-300-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-300-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-300"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
index a6eaf1e3a9a..e79d053c7f5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-301",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.93.13",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.93.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-301-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-301-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.26.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.26.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-301.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-301.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.153.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.153.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-301-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-301-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-301"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
index 6841c9bf26f..1eb2666451f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-302",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.93.14",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.93.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-302-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-302-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.26.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.26.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-302.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-302.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.153.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.153.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-302-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-302-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-302"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
index 5e4691c936d..f6086cec368 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-303",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.93.15",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.93.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-303-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-303-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.26.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.26.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-303.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-303.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.153.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.153.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-303-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-303-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-303"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
index 13398def784..1cab08ea5c8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-304",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.93.16",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.93.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-304-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-304-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.26.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.26.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-304.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-304.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.153.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.153.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-304-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-304-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-304"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
index 8b177dbf904..987a95f4070 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-305",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.93.17",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.93.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-305-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-305-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.26.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.26.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-305.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-305.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.153.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.153.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-305-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-305-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-305"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
index 7ec11e893ab..b480e75343a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-306",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.93.18",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.93.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-306-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-306-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.26.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.26.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-306.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-306.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.153.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.153.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-306-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-306-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-306"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
index 473faef9948..06f234b2cb4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-307",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.93.19",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.93.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-307-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-307-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.26.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.26.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-307.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-307.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.153.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.153.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-307-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-307-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-307"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
index 28aafbaa181..9c0470d5795 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-308",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.93.20",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.93.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-308-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-308-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.26.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.26.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-308.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-308.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.153.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.153.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-308-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-308-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-308"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
index bfdee7169f6..08a60503536 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-309",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.93.21",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.93.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-309-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-309-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.26.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.26.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-309.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-309.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.153.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.153.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-309-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-309-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-309"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
index 235cd5f3356..8b7ff6a6c35 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-31",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.70.31",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.70.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-31-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-31-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.3.31",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.3.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-31.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-31.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.130.31",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.130.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-31-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-31-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
index 2fd31ec4004..dad5a6390d3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-310",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.93.22",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.93.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-310-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-310-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.26.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.26.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-310.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-310.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.153.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.153.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-310-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-310-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2400000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "250",
+    "clock_speed": 2400000000.0,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-310"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
index 73e49346e93..f4661fdf4b2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-32",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.70.32",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.70.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-32-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-32-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.3.32",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.3.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-32.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-32.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.130.32",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.130.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-32-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-32-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
index 5c0ec677493..7712a4ce7cf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-33",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.70.33",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.70.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-33-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-33-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.3.33",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.3.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-33.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-33.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.130.33",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.130.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-33-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-33-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
index 95b3fc47db9..20af1d04c1e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-34",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.70.34",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.70.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-34-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-34-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.3.34",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.3.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-34.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-34.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.130.34",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.130.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-34-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-34-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
index 943fe29913a..d4f6be25cdf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-35",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.70.35",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.70.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-35-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-35-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.3.35",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.3.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-35.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-35.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.130.35",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.130.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-35-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-35-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
index 9b5a3f68111..3f86341244b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-36",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.70.36",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.70.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-36-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-36-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.3.36",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.3.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-36.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-36.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.130.36",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.130.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-36-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-36-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
index a3c7f444f9a..a45823851d8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-37",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.71.1",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.71.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-37-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-37-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.4.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.4.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-37.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-37.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.131.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.131.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-37-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-37-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
index 56ec76167a1..2ab8bd26738 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-38",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.71.2",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.71.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-38-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-38-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.4.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.4.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-38.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-38.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.131.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.131.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-38-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-38-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
index 0863c68ed75..7dc49273c7a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-39",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.71.3",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.71.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-39-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-39-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.4.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.4.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-39.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-39.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.131.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.131.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-39-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-39-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
index 486329ef6db..f447c1079e8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-4",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.68.4",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.68.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-4-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-4-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.1.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.1.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-4.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-4.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.128.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.128.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-4-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-4-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
index b372579b0b3..b3781c3e32b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-40",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.71.4",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.71.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-40-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-40-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.4.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.4.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-40.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-40.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.131.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.131.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-40-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-40-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
index 3c253857ba6..221be0425d9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-41",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.71.5",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.71.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-41-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-41-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.4.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.4.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-41.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-41.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.131.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.131.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-41-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-41-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
index 8451a4d09c7..3698c548091 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-42",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.71.6",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.71.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-42-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-42-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.4.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.4.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-42.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-42.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.131.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.131.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-42-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-42-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
index a56270afeef..ef06c3dfce6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-43",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.71.7",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.71.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-43-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-43-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.4.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.4.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-43.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-43.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.131.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.131.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-43-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-43-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
index 6ddcd4ce68b..a1e81d039b7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-44",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.71.8",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.71.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-44-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-44-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.4.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.4.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-44.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-44.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.131.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.131.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-44-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-44-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
index c043875c208..352116fa17f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-45",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.71.9",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.71.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-45-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-45-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.4.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.4.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-45.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-45.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.131.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.131.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-45-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-45-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
index b35aba2501e..099a387b2f8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-46",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.71.10",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.71.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-46-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-46-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.4.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.4.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-46.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-46.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.131.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.131.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-46-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-46-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
index a6ec93d0bb9..ae4697fa291 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-47",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.71.11",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.71.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-47-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-47-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.4.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.4.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-47.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-47.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.131.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.131.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-47-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-47-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
index 3a94ea9d1f0..031179bca57 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-48",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.71.12",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.71.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-48-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-48-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.4.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.4.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-48.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-48.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.131.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.131.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-48-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-48-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
index 879057c0b0f..72944728930 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-49",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.72.13",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.72.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-49-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-49-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.5.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.5.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-49.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-49.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.132.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.132.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-49-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-49-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
index 35021d02040..f7c00ccc304 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-5",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.68.5",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.68.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-5-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-5-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.1.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.1.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-5.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-5.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.128.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.128.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-5-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-5-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
index 07fb1bca2be..f93bbdc0a88 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-50",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.72.14",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.72.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-50-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-50-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.5.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.5.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-50.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-50.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.132.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.132.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-50-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-50-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
index 704b7c683a9..3ccfafc56a1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-51",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.72.15",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.72.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-51-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-51-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.5.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.5.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-51.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-51.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.132.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.132.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-51-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-51-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
index 79ab92fbb4e..30a36cb65f6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-52",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.72.16",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.72.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-52-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-52-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.5.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.5.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-52.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-52.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.132.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.132.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-52-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-52-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
index f642dd86cf3..4517d3afcb9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-53",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.72.17",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.72.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-53-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-53-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.5.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.5.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-53.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-53.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.132.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.132.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-53-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-53-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
index ed06b9ea99b..b23064dcc17 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-54",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.72.18",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.72.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-54-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-54-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.5.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.5.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-54.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-54.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.132.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.132.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-54-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-54-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
index 04b0fbb241f..ff98ff5265c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-55",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.72.19",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.72.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-55-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-55-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.5.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.5.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-55.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-55.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.132.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.132.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-55-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-55-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
index 5471c7a0e15..7733ded5ea7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-56",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.72.20",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.72.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-56-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-56-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.5.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.5.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-56.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-56.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.132.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.132.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-56-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-56-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
index 83ddb16a7fc..bcb781a2c5e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-57",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.72.21",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.72.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-57-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-57-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.5.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.5.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-57.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-57.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.132.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.132.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-57-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-57-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-57"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
index f6fc0a2b906..6fba499286c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-58",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.72.22",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.72.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-58-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-58-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.5.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.5.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-58.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-58.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.132.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.132.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-58-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-58-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-58"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
index 31d3efdeac0..ffb3dd91bba 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-59",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.72.23",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.72.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-59-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-59-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.5.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.5.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-59.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-59.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.132.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.132.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-59-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-59-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-59"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
index 3eb7ab791b6..712a56b668c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-6",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.68.6",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.68.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-6-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-6-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.1.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.1.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-6.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-6.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.128.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.128.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-6-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-6-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
index 672854a8713..25edb24b29b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-60",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.72.24",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.72.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-60-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-60-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.5.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.5.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-60.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-60.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.132.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.132.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-60-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-60-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-60"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
index c2f9c205f05..8b314894e2d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-61",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.73.25",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.73.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-61-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-61-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.6.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.6.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-61.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-61.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.133.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.133.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-61-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-61-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-61"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
index 6fdd22d0d7b..c9e90110818 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-62",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.73.26",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.73.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-62-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-62-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.6.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.6.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-62.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-62.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.133.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.133.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-62-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-62-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-62"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
index 7958cb90fdc..3287e65bcba 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-63",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.73.27",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.73.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-63-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-63-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.6.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.6.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-63.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-63.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.133.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.133.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-63-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-63-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-63"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
index 02fd97f2239..94c3b30f857 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-64",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.73.28",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.73.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-64-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-64-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.6.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.6.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-64.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-64.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.133.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.133.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-64-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-64-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-64"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
index ae81a067ed2..2fb5d47772d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-65",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.73.29",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.73.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-65-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-65-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.6.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.6.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-65.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-65.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.133.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.133.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-65-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-65-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-65"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
index 110988c9752..00c2eb1cba5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-66",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.73.30",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.73.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-66-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-66-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.6.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.6.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-66.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-66.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.133.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.133.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-66-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-66-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-66"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
index a867cc4930e..d41f36d699f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-67",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.73.31",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.73.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-67-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-67-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.6.31",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.6.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-67.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-67.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.133.31",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.133.31",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-67-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-67-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-67"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
index 5ba4847570d..afd4372549c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-68",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.73.32",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.73.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-68-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-68-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.6.32",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.6.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-68.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-68.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.133.32",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.133.32",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-68-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-68-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-68"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
index 174983f2685..6a9dfc1d067 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-69",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.73.33",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.73.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-69-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-69-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.6.33",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.6.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-69.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-69.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.133.33",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.133.33",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-69-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-69-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-69"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
index 1bdfa2a1349..ab87f60fae5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-7",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.68.7",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.68.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-7-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-7-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.1.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.1.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-7.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-7.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.128.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.128.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-7-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-7-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
index 75a74a1398f..ec07c7ec035 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-70",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.73.34",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.73.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-70-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-70-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.6.34",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.6.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-70.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-70.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.133.34",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.133.34",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-70-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-70-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-70"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
index 2a95e221b74..01496db93df 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-71",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.73.35",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.73.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-71-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-71-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.6.35",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.6.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-71.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-71.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.133.35",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.133.35",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-71-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-71-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-71"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
index 87b5e06911a..db8b334de06 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-72",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.73.36",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.73.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-72-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-72-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.6.36",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.6.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-72.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-72.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.133.36",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.133.36",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-72-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-72-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-72"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
index 96ad836361f..c35758b0879 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-73",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.74.1",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.74.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-73-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-73-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.7.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.7.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-73.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-73.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.134.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.134.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-73-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-73-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-73"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
index 0819eba57f8..67f0524d488 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-74",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.74.2",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.74.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-74-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-74-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.7.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.7.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-74.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-74.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.134.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.134.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-74-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-74-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-74"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
index 9adb54e72e6..80a9486f0dc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-75",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.74.3",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.74.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-75-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-75-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.7.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.7.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-75.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-75.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.134.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.134.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-75-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-75-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-75"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
index fb99c8fb9c0..09bf10232b4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-76",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.74.4",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.74.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-76-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-76-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.7.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.7.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-76.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-76.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.134.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.134.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-76-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-76-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-76"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
index 0bb24c1bedd..953de0af8fd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-77",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.74.5",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.74.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-77-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-77-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.7.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.7.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-77.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-77.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.134.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.134.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-77-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-77-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-77"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
index 93f2d68c383..7568f402862 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-78",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.74.6",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.74.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-78-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-78-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.7.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.7.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-78.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-78.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.134.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.134.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-78-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-78-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-78"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
index 9e35269989e..8e4cab60a17 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-79",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.74.7",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.74.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-79-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-79-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.7.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.7.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-79.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-79.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.134.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.134.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-79-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-79-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-79"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
index 3e44c5248b2..cf5d50117c5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-8",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.68.8",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.68.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-8-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-8-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.1.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.1.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-8.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-8.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.128.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.128.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-8-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-8-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
index d6a6d8bd880..6aded25fcec 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-80",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.74.8",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.74.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-80-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-80-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.7.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.7.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-80.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-80.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.134.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.134.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-80-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-80-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-80"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
index 38f5ae7ad9a..0acf214aaaf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-81",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.74.9",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.74.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-81-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-81-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.7.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.7.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-81.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-81.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.134.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.134.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-81-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-81-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-81"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
index f7178146d48..0b4116c676f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-82",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.74.10",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.74.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-82-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-82-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.7.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.7.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-82.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-82.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.134.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.134.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-82-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-82-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-82"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
index 70a9ccb82a9..addf8b23906 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-83",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.74.11",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.74.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-83-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-83-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.7.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.7.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-83.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-83.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.134.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.134.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-83-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-83-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-83"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
index fa108ff1e76..07b9144f0fe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-84",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.74.12",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.74.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-84-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-84-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.7.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.7.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-84.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-84.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.134.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.134.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-84-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-84-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-84"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
index 93bf89ca0df..83f2994e7d6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-85",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.75.13",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.75.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-85-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-85-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.8.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.8.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-85.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-85.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.135.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.135.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-85-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-85-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-85"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
index dc553ba5eb1..a7ae6650cd6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-86",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.75.14",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.75.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-86-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-86-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.8.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.8.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-86.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-86.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.135.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.135.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-86-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-86-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-86"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
index c3b2bed325e..f4f9372c22d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-87",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.75.15",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.75.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-87-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-87-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.8.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.8.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-87.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-87.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.135.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.135.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-87-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-87-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-87"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
index e2f7c611723..3ca70ea9079 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-88",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.75.16",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.75.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-88-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-88-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.8.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.8.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-88.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-88.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.135.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.135.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-88-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-88-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-88"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
index 9af5815f5e7..837259df3e1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-89",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.75.17",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.75.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-89-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-89-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.8.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.8.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-89.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-89.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.135.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.135.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-89-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-89-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-89"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
index a731f5fadaa..9b66ca49ee2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-9",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.68.9",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.68.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-9-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-9-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.1.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.1.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-9.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-9.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.128.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.128.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-9-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-9-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
index 02054476a08..25ad69a21cb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-90",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.75.18",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.75.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-90-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-90-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.8.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.8.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-90.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-90.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.135.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.135.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-90-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-90-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-90"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
index a45954b2783..3c430469c85 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-91",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.75.19",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.75.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-91-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-91-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.8.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.8.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-91.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-91.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.135.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.135.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-91-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-91-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-91"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
index 758a16a3f17..4a970c6409f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-92",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.75.20",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.75.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-92-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-92-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.8.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.8.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-92.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-92.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.135.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.135.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-92-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-92-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-92"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
index bf0ac8c6720..f1be1549b73 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-93",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.75.21",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.75.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-93-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-93-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.8.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.8.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-93.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-93.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.135.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.135.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-93-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-93-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-93"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
index 49f2ab5261e..a03800b76b1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-94",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.75.22",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.75.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-94-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-94-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.8.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.8.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-94.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-94.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.135.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.135.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-94-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-94-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-94"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
index a85e70ea343..7c5e4ad1a09 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-95",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.75.23",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.75.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-95-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-95-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.8.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.8.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-95.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-95.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.135.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.135.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-95-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-95-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-95"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
index 6d17982e945..ca84fd4040c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-96",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.75.24",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.75.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-96-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-96-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.8.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.8.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-96.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-96.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.135.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.135.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-96-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-96-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-96"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
index 8ecbeaed223..611b47d33f2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-97",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.76.25",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.76.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-97-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-97-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.9.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.9.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-97.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-97.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.136.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.136.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-97-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-97-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-97"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
index 6446eb159ab..f9d4ba26161 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-98",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.76.26",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.76.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-98-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-98-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.9.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.9.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-98.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-98.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.136.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.136.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-98-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-98-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-98"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
index 67b64de006c..05eeb8ef54f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "gdx-99",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 10000000000,
       "device": "myri0",
-      "vendor": "Myrinet",
-      "mac": null,
-      "ip": "172.24.76.27",
+      "driver": null,
       "enabled": true,
-      "version": "10G-PCIE-8A-C",
       "interface": "Myrinet",
+      "ip": "172.24.76.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": null,
-      "network_address": "gdx-99-myri0.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-99-myri0.orsay.grid5000.fr",
+      "rate": 10000000000,
+      "switch": null,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.9.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.9.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-99.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "gdx-99.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.136.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.136.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "gdx-99-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": false
+      "mounted": false,
+      "network_address": "gdx-99-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "gdx-99"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/netgdx.json b/data/grid5000/sites/orsay/clusters/netgdx/netgdx.json
index 9400233a023..de42a6debb7 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/netgdx.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/netgdx.json
@@ -1,7 +1,7 @@
 {
-  "type": "cluster",
+  "created_at": null,
   "misc": "bios:1.28/bcm:1.20.17/bmc:1.10/rsaII:1.00",
-  "uid": "netgdx",
   "model": "IBM eServer 326m",
-  "created_at": null
+  "type": "cluster",
+  "uid": "netgdx"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
index f09b1aacd22..c29d8622c38 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-1",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-1-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-1-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.1",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.1",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-1-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-1-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
index 0611b57cef2..d841c92cbd1 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-10",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-10.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-10.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-10-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-10-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.10",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.10",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-10-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-10-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
index eb3fa983904..6a1eaf30be8 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-11",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-11.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-11.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-11-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-11-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.11",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.11",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-11-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-11-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
index 3dc8db73116..96ce35fa25d 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-12",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-12.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-12.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-12-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-12-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.12",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.12",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-12-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-12-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
index 2fa6469c315..e715e0f0170 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-13",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-13.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-13.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-13-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-13-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.13",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.13",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-13-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-13-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
index bb9bedabb80..9ee47a96d0f 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-14",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-14.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-14.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-14-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-14-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.14",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.14",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-14-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-14-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
index fb20e1c03ab..38daf3b922f 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-15",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-15.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-15.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-15-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-15-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.15",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.15",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-15-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-15-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
index 826e148aa76..e901978804a 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-16",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-16.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-16.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-16-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-16-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.16",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.16",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-16-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-16-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
index e29c7f7f6f8..c97faf48e71 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-17",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-17.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-17.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-17-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-17-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.17",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.17",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-17-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-17-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
index a4e900412b8..00260b39359 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-18",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-18.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-18.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-18-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-18-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.18",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.18",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-18-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-18-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
index ea141d0028b..dfe79f256c1 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-19",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-19.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-19.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-19-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-19-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.19",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.19",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-19-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-19-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
index a86a2cb370f..0e9e277bb08 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-2",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-2-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-2-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.2",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.2",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-2-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-2-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
index 9b95bcacecd..c94e690f2c5 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-20",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-20.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-20.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-20-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-20-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.20",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.20",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-20-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-20-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
index 179dbb3b61a..c62c2ccb74c 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-21",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-21.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-21.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-21-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-21-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.21",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.21",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-21-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-21-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
index a790504d365..dbe2f2e5dc8 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-22",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-22.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-22.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-22-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-22-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.22",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.22",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-22-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-22-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
index c39bb1eee79..475203cd3a2 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-23",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-23.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-23.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-23-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-23-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.23",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.23",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-23-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-23-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
index 83346a73a5e..1c75a95d53f 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-24",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-24.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-24.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-24-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-24-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.24",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.24",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-24-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-24-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
index 901a783847c..a7711abccf5 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-25",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-25.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-25.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-25-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-25-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.25",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.25",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-25-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-25-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
index 7e46c06565c..b8081424e48 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-26",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-26.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-26.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-26-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-26-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.26",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.26",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-26-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-26-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
index e8eb93ec89f..d8f055b78f8 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-27",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-27.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-27.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-27-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-27-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.27",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.27",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-27-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-27-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
index cb3c0381418..91a89857e09 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-28",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-28.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-28.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-28-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-28-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.28",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.28",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-28-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-28-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
index 5c73758dcc5..8f16a74fa63 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-29",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-29.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-29.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-29-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-29-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.29",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.29",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-29-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-29-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
index 52cbfa72609..1940a9156b9 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-3",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-3.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-3.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-3-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-3-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.3",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.3",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-3-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-3-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
index ffa59353e1b..904f0b8e395 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-30",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-30.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-30.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-30-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-30-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.30",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.30",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-30-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-30-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
index 99cfee6b63c..bba32e7ba4e 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-4",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-4.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-4.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-4-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-4-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.4",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.4",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-4-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-4-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
index cce226cc01f..15f9c06b9b9 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-5",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-5.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-5.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-5-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-5-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.5",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.5",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-5-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-5-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
index f972d4e1458..af3adf5e9f5 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-6",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-6.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-6.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-6-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-6-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.6",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.6",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-6-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-6-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
index 329999f2d35..95c2ce52e87 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-7",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-7.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-7.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-7-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-7-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.7",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.7",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-7-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-7-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
index f7357fe24dd..1822a63f91a 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-8",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-8.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-8.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-8-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-8-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.8",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.8",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-8-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-8-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
index 6103019650a..96451cb1751 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  },
-  "uid": "netgdx-9",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -29,64 +10,83 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.110.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.110.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-9.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-9.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.240.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5780",
       "interface": "Ethernet",
+      "ip": "172.24.240.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-9-eth1.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-9-eth1.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "172.24.190.9",
+      "driver": "tg3",
       "enabled": true,
-      "version": "NetXtreme BCM5703",
       "interface": "Ethernet",
+      "ip": "172.24.190.9",
+      "mac": null,
       "management": false,
-      "switch": null,
-      "driver": "tg3",
-      "network_address": "netgdx-9-eth2.orsay.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "netgdx-9-eth2.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5703"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2000000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "246",
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": "",
     "model": "AMD Opteron",
-    "cache_l1": null
-  }
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "netgdx-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/orsay.json b/data/grid5000/sites/orsay/orsay.json
index 50f7e6b4ef7..8c1413ed678 100755
--- a/data/grid5000/sites/orsay/orsay.json
+++ b/data/grid5000/sites/orsay/orsay.json
@@ -1,14 +1,14 @@
 {
-  "type": "site",
-  "user_support_contact": null,
+  "description": "",
+  "email_contact": null,
   "latitude": 48.7,
-  "uid": "orsay",
+  "location": "Orsay, France",
   "longitude": 2.2,
-  "email_contact": null,
-  "sys_admin_contact": null,
   "name": "Orsay",
-  "location": "Orsay, France",
-  "description": "",
   "security_contact": null,
+  "sys_admin_contact": null,
+  "type": "site",
+  "uid": "orsay",
+  "user_support_contact": null,
   "web": null
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-1.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-1.json
index e46cffd59b4..17d1604d022 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-1.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-1.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-1",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.101",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-1.rennes.grid5000.fr",
+      "ip": "131.254.202.101",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-1.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-10.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-10.json
index 0025709410e..886aa26b729 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-10.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-10.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-10",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.110",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-10.rennes.grid5000.fr",
+      "ip": "131.254.202.110",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-10.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-11.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-11.json
index f651af3498e..da7f10ff485 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-11.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-11.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-11",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.111",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-11.rennes.grid5000.fr",
+      "ip": "131.254.202.111",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-11.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-12.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-12.json
index c20fad350d7..33328a4153c 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-12.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-12.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-12",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.112",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-12.rennes.grid5000.fr",
+      "ip": "131.254.202.112",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-12.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-13.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-13.json
index ef054f6df73..cefb9fb2045 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-13.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-13.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-13",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.113",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-13.rennes.grid5000.fr",
+      "ip": "131.254.202.113",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-13.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-14.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-14.json
index 70e36080449..1acb344dcb5 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-14.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-14.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-14",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.114",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-14.rennes.grid5000.fr",
+      "ip": "131.254.202.114",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-14.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-15.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-15.json
index 53253b2198d..f8a671af6c2 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-15.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-15.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-15",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.115",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-15.rennes.grid5000.fr",
+      "ip": "131.254.202.115",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-15.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-16.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-16.json
index 371432a1669..5542bc4f3b0 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-16.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-16.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-16",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.116",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-16.rennes.grid5000.fr",
+      "ip": "131.254.202.116",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-16.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-17.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-17.json
index 72de24e22d9..37db9ca04f5 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-17.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-17.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-17",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.117",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-17.rennes.grid5000.fr",
+      "ip": "131.254.202.117",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-17.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-18.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-18.json
index 280fedbc5c4..5cb34e47e8d 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-18.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-18.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-18",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.118",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-18.rennes.grid5000.fr",
+      "ip": "131.254.202.118",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-18.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-19.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-19.json
index 437aecaf8db..1a8efc1e7c4 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-19.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-19.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-19",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.119",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-19.rennes.grid5000.fr",
+      "ip": "131.254.202.119",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-19.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-2.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-2.json
index 9734ee28c12..5e1da0b83a4 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-2.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-2.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-2",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.102",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-2.rennes.grid5000.fr",
+      "ip": "131.254.202.102",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-2.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-20.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-20.json
index be92db48839..1ce1f9aa8f7 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-20.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-20.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-20",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.120",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-20.rennes.grid5000.fr",
+      "ip": "131.254.202.120",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-20.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-21.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-21.json
index 970e94345ba..11b7a504e8e 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-21.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-21.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-21",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.121",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-21.rennes.grid5000.fr",
+      "ip": "131.254.202.121",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-21.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-22.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-22.json
index 0c2f7445b8e..208e28d143a 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-22.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-22.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-22",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.122",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-22.rennes.grid5000.fr",
+      "ip": "131.254.202.122",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-22.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-23.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-23.json
index b9803718aa8..5dff7083cc4 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-23.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-23.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-23",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.123",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-23.rennes.grid5000.fr",
+      "ip": "131.254.202.123",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-23.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-24.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-24.json
index 925ba6f3508..c9a0d26b5b2 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-24.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-24.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-24",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.124",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-24.rennes.grid5000.fr",
+      "ip": "131.254.202.124",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-24.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-25.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-25.json
index 31e8548193d..8170fd2084f 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-25.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-25.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-25",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.125",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-25.rennes.grid5000.fr",
+      "ip": "131.254.202.125",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-25.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-26.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-26.json
index 22989d3aba5..4009a8e2eff 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-26.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-26.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-26",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.126",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-26.rennes.grid5000.fr",
+      "ip": "131.254.202.126",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-26.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-27.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-27.json
index 0e61fb61fe9..8910d67eb12 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-27.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-27.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-27",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.127",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-27.rennes.grid5000.fr",
+      "ip": "131.254.202.127",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-27.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-28.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-28.json
index 592a20f1972..e0917642866 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-28.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-28.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-28",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.128",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-28.rennes.grid5000.fr",
+      "ip": "131.254.202.128",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-28.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-29.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-29.json
index c1a0d53ee66..f97666d5fb9 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-29.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-29.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-29",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.129",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-29.rennes.grid5000.fr",
+      "ip": "131.254.202.129",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-29.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-3.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-3.json
index a3b25f6345f..2f982af82a6 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-3.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-3.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-3",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.103",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-3.rennes.grid5000.fr",
+      "ip": "131.254.202.103",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-3.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-30.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-30.json
index 39ef1284d9c..30f02d9a2e0 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-30.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-30.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-30",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.130",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-30.rennes.grid5000.fr",
+      "ip": "131.254.202.130",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-30.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-31.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-31.json
index 19f4bcbf421..ae9044e4d79 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-31.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-31.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-31",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.131",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-31.rennes.grid5000.fr",
+      "ip": "131.254.202.131",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-31.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-32.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-32.json
index c508d6522ff..4a054bad243 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-32.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-32.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-32",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.132",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-32.rennes.grid5000.fr",
+      "ip": "131.254.202.132",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-32.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-33.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-33.json
index 65cb8282e67..4c4b38e272d 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-33.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-33.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-33",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.133",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-33.rennes.grid5000.fr",
+      "ip": "131.254.202.133",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-33.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-34.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-34.json
index be8be5b970f..d73e7112372 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-34.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-34.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-34",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.134",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-34.rennes.grid5000.fr",
+      "ip": "131.254.202.134",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-34.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-35.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-35.json
index 683ecfff865..77a46b2ffb7 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-35.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-35.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-35",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.135",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-35.rennes.grid5000.fr",
+      "ip": "131.254.202.135",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-35.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-36.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-36.json
index 3722c26e01c..27f12840ad3 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-36.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-36.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-36",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.136",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-36.rennes.grid5000.fr",
+      "ip": "131.254.202.136",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-36.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-37.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-37.json
index 54063f9e6c2..cb1565e63c5 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-37.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-37.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-37",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.137",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-37.rennes.grid5000.fr",
+      "ip": "131.254.202.137",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-37.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-38.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-38.json
index 5245ce8be24..f65749d27c1 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-38.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-38.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-38",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.138",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-38.rennes.grid5000.fr",
+      "ip": "131.254.202.138",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-38.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-39.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-39.json
index 54fd8a89d4d..3da20595adc 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-39.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-39.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-39",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.139",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-39.rennes.grid5000.fr",
+      "ip": "131.254.202.139",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-39.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-4.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-4.json
index 4452e5dcce3..5f462d9c5ab 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-4.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-4.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-4",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.104",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-4.rennes.grid5000.fr",
+      "ip": "131.254.202.104",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-4.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-40.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-40.json
index efb811fe3e7..60f669ff43a 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-40.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-40.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-40",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.140",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-40.rennes.grid5000.fr",
+      "ip": "131.254.202.140",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-40.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-41.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-41.json
index 4c43ebb9a9f..c58286394aa 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-41.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-41.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-41",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.141",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-41.rennes.grid5000.fr",
+      "ip": "131.254.202.141",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-41.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-42.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-42.json
index 2bc4f8cf1ed..f68dbae7ec3 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-42.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-42.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-42",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.142",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-42.rennes.grid5000.fr",
+      "ip": "131.254.202.142",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-42.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-43.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-43.json
index dbf539c7d42..4801bdc274f 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-43.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-43.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-43",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.143",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-43.rennes.grid5000.fr",
+      "ip": "131.254.202.143",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-43.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-44.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-44.json
index 7f679db402a..42ef8e0474a 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-44.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-44.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-44",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.144",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-44.rennes.grid5000.fr",
+      "ip": "131.254.202.144",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-44.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-45.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-45.json
index d6ebad66857..4d05f686933 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-45.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-45.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-45",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.145",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-45.rennes.grid5000.fr",
+      "ip": "131.254.202.145",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-45.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-46.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-46.json
index b758bdd9280..8447c4b9d57 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-46.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-46.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-46",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.146",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-46.rennes.grid5000.fr",
+      "ip": "131.254.202.146",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-46.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-47.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-47.json
index ab5f04e54e0..60a000571e5 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-47.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-47.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-47",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.147",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-47.rennes.grid5000.fr",
+      "ip": "131.254.202.147",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-47.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-48.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-48.json
index d1d80afa86c..07bb0643714 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-48.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-48.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-48",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.148",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-48.rennes.grid5000.fr",
+      "ip": "131.254.202.148",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-48.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-49.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-49.json
index 9897823b799..2b0e177407f 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-49.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-49.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-49",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.149",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-49.rennes.grid5000.fr",
+      "ip": "131.254.202.149",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-49.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-5.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-5.json
index 8b8321c7986..f50d1bd97ef 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-5.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-5.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-5",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.105",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-5.rennes.grid5000.fr",
+      "ip": "131.254.202.105",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-5.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-50.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-50.json
index 72717085530..9121a7f719c 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-50.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-50.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-50",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.150",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-50.rennes.grid5000.fr",
+      "ip": "131.254.202.150",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-50.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-51.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-51.json
index b30b89273ff..e78ad8f6204 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-51.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-51.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-51",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.151",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-51.rennes.grid5000.fr",
+      "ip": "131.254.202.151",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-51.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-52.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-52.json
index e6aee4e6ea4..cea2a41ce25 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-52.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-52.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-52",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.152",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-52.rennes.grid5000.fr",
+      "ip": "131.254.202.152",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-52.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-53.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-53.json
index 37c090fa819..ca374afcc32 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-53.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-53.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-53",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.153",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-53.rennes.grid5000.fr",
+      "ip": "131.254.202.153",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-53.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-54.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-54.json
index 555a48c7872..3de170ae6ce 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-54.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-54.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-54",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.154",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-54.rennes.grid5000.fr",
+      "ip": "131.254.202.154",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-54.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-55.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-55.json
index dd94729ad37..2f1848c2009 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-55.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-55.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-55",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.155",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-55.rennes.grid5000.fr",
+      "ip": "131.254.202.155",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-55.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-56.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-56.json
index ac51a9c9a75..73716e3a582 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-56.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-56.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-56",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.156",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-56.rennes.grid5000.fr",
+      "ip": "131.254.202.156",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-56.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-57.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-57.json
index 318c531f816..ec7fb51716c 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-57.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-57.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-57",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.157",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-57.rennes.grid5000.fr",
+      "ip": "131.254.202.157",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-57.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-57"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-58.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-58.json
index 9501880c040..e641c4ce198 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-58.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-58.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-58",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.158",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-58.rennes.grid5000.fr",
+      "ip": "131.254.202.158",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-58.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-58"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-59.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-59.json
index 99ff8ca2551..34bd88e20dd 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-59.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-59.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-59",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.159",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-59.rennes.grid5000.fr",
+      "ip": "131.254.202.159",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-59.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-59"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-6.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-6.json
index 0583d0d2a78..8d84e83e7ab 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-6.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-6.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-6",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.106",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-6.rennes.grid5000.fr",
+      "ip": "131.254.202.106",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-6.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-60.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-60.json
index 8f5ee9f377e..ce5d24a111d 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-60.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-60.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-60",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.160",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-60.rennes.grid5000.fr",
+      "ip": "131.254.202.160",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-60.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-60"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-61.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-61.json
index 8b59da5d609..3e1182f615e 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-61.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-61.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-61",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.161",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-61.rennes.grid5000.fr",
+      "ip": "131.254.202.161",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-61.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-61"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-62.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-62.json
index e576b916d1d..fdb6e2a2d07 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-62.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-62.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-62",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.162",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-62.rennes.grid5000.fr",
+      "ip": "131.254.202.162",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-62.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-62"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-63.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-63.json
index 3ed02e34be9..cee0140168d 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-63.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-63.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-63",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.163",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-63.rennes.grid5000.fr",
+      "ip": "131.254.202.163",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-63.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-63"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-64.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-64.json
index 96c9da38cb2..77e498a085c 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-64.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-64.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-64",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.164",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-64.rennes.grid5000.fr",
+      "ip": "131.254.202.164",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-64.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-64"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-7.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-7.json
index 0d83d97e11f..25f4554594b 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-7.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-7.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-7",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.107",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-7.rennes.grid5000.fr",
+      "ip": "131.254.202.107",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-7.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-8.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-8.json
index 30fa2e2f044..fc5827566b7 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-8.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-8.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-8",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.108",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-8.rennes.grid5000.fr",
+      "ip": "131.254.202.108",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-8.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-9.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-9.json
index df2f109f375..045e4da476f 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-9.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-9.json
@@ -1,65 +1,65 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paradent-9",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.109",
+      "driver": "e1000e",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paradent-9.rennes.grid5000.fr",
+      "ip": "131.254.202.109",
       "management": false,
-      "driver": "e1000e",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paradent-9.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "e1000e"
+      "rate": 1000000000
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2500000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "L5420"
   },
   "storage_devices": [
     {
-      "size": 149011611938.477,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "driver": "ata_piix"
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "cache_l2": null,
-    "version": "L5420",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paradent-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paradent/paradent.json b/data/grid5000/sites/rennes/clusters/paradent/paradent.json
index a5642117a59..f3124659462 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/paradent.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/paradent.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
   "created_at": "Sat, 31 Jan 2009 23:00:00 GMT",
-  "uid": "paradent",
-  "model": "Carry System"
+  "model": "Carry System",
+  "type": "cluster",
+  "uid": "paradent"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-1.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-1.json
index d9269ea9452..1ee1ef23cdd 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-1.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-1.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-1",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.171",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-1.rennes.grid5000.fr",
+      "ip": "131.254.202.171",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-1.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.171",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-1-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.171",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-1-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-10.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-10.json
index 1e62bd50013..b4e69352c2b 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-10.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-10.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-10",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.180",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-10.rennes.grid5000.fr",
+      "ip": "131.254.202.180",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-10.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.180",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-10-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.180",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-10-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-11.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-11.json
index 79990ffbb79..84ab13d69be 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-11.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-11.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-11",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.181",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-11.rennes.grid5000.fr",
+      "ip": "131.254.202.181",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-11.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.181",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-11-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.181",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-11-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-12.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-12.json
index 32e7afd15a8..bf1520d8df0 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-12.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-12.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-12",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.182",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-12.rennes.grid5000.fr",
+      "ip": "131.254.202.182",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-12.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.182",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-12-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.182",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-12-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-13.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-13.json
index 3bef693d573..e49c8cad3eb 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-13.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-13.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-13",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.183",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-13.rennes.grid5000.fr",
+      "ip": "131.254.202.183",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-13.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.183",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-13-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.183",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-13-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-14.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-14.json
index 9a9bf4120c7..7d3f6dbf419 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-14.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-14.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-14",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.184",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-14.rennes.grid5000.fr",
+      "ip": "131.254.202.184",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-14.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.184",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-14-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.184",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-14-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-15.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-15.json
index 50668bca7ac..f2b9a7c6914 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-15.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-15.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-15",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.185",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-15.rennes.grid5000.fr",
+      "ip": "131.254.202.185",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-15.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.185",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-15-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.185",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-15-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-16.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-16.json
index 0171ca1b117..9af1266e497 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-16.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-16.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-16",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.186",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-16.rennes.grid5000.fr",
+      "ip": "131.254.202.186",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-16.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.186",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-16-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.186",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-16-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-17.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-17.json
index adaa1b8d457..dc21d1cd87f 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-17.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-17.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-17",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.187",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-17.rennes.grid5000.fr",
+      "ip": "131.254.202.187",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-17.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.187",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-17-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.187",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-17-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-18.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-18.json
index 646e9e7d0da..2b5a242313c 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-18.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-18.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-18",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.188",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-18.rennes.grid5000.fr",
+      "ip": "131.254.202.188",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-18.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.188",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-18-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.188",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-18-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-19.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-19.json
index 3fff21c13c8..d5be9f0a6f7 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-19.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-19.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-19",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.189",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-19.rennes.grid5000.fr",
+      "ip": "131.254.202.189",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-19.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.189",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-19-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.189",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-19-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-2.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-2.json
index 858c7f708bd..52da6762490 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-2.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-2.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-2",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.172",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-2.rennes.grid5000.fr",
+      "ip": "131.254.202.172",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-2.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.172",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-2-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.172",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-2-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-20.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-20.json
index 3ba466d768d..0340f0bb5b1 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-20.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-20.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-20",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.190",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-20.rennes.grid5000.fr",
+      "ip": "131.254.202.190",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-20.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.190",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-20-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.190",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-20-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-21.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-21.json
index c6ea44d6b88..b393457f129 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-21.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-21.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-21",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.191",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-21.rennes.grid5000.fr",
+      "ip": "131.254.202.191",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-21.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.191",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-21-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.191",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-21-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-22.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-22.json
index a9ae38df767..dd90eca3b29 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-22.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-22.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-22",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.192",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-22.rennes.grid5000.fr",
+      "ip": "131.254.202.192",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-22.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.192",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-22-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.192",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-22-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-23.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-23.json
index 3528582de2f..fdddfac00e2 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-23.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-23.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-23",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.193",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-23.rennes.grid5000.fr",
+      "ip": "131.254.202.193",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-23.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.193",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-23-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.193",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-23-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-24.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-24.json
index 58a4d66b23b..c0732b8bc48 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-24.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-24.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-24",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.194",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-24.rennes.grid5000.fr",
+      "ip": "131.254.202.194",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-24.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.194",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-24-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.194",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-24-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-25.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-25.json
index 3920f9c2196..cffd0283c19 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-25.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-25.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-25",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.195",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-25.rennes.grid5000.fr",
+      "ip": "131.254.202.195",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-25.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.195",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-25-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.195",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-25-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-26.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-26.json
index a0ea19a8471..5995f542563 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-26.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-26.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-26",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.196",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-26.rennes.grid5000.fr",
+      "ip": "131.254.202.196",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-26.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.196",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-26-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.196",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-26-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-27.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-27.json
index c913cd9c950..6b6b5625e91 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-27.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-27.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-27",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.197",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-27.rennes.grid5000.fr",
+      "ip": "131.254.202.197",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-27.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.197",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-27-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.197",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-27-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-28.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-28.json
index c22ffbb06c0..183fc3e10aa 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-28.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-28.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-28",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.198",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-28.rennes.grid5000.fr",
+      "ip": "131.254.202.198",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-28.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.198",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-28-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.198",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-28-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-29.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-29.json
index e3d598300b5..f77c7353c77 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-29.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-29.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-29",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.199",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-29.rennes.grid5000.fr",
+      "ip": "131.254.202.199",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-29.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.199",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-29-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.199",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-29-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-3.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-3.json
index 07f1ad86b9b..edfb98d9549 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-3.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-3.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-3",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.173",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-3.rennes.grid5000.fr",
+      "ip": "131.254.202.173",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-3.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.173",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-3-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.173",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-3-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-30.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-30.json
index 8984ffe30e8..c74bb4db6c7 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-30.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-30.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-30",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.200",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-30.rennes.grid5000.fr",
+      "ip": "131.254.202.200",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-30.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.200",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-30-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.200",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-30-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-31.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-31.json
index d139c892014..a77f721662b 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-31.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-31.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-31",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.201",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-31.rennes.grid5000.fr",
+      "ip": "131.254.202.201",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-31.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.201",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-31-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.201",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-31-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-32.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-32.json
index 1a6cfcf5b67..17bb1cb6336 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-32.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-32.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-32",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.202",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-32.rennes.grid5000.fr",
+      "ip": "131.254.202.202",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-32.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.202",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-32-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.202",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-32-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-33.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-33.json
index b9c33a225a4..40fed283bb3 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-33.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-33.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-33",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.203",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-33.rennes.grid5000.fr",
+      "ip": "131.254.202.203",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-33.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.203",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-33-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.203",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-33-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-4.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-4.json
index 7bd1570c468..18fb3d8344c 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-4.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-4.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-4",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.174",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-4.rennes.grid5000.fr",
+      "ip": "131.254.202.174",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-4.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.174",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-4-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.174",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-4-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-5.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-5.json
index 47a31a3a31e..6083cf5eb53 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-5.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-5.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-5",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.175",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-5.rennes.grid5000.fr",
+      "ip": "131.254.202.175",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-5.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.175",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-5-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.175",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-5-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-6.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-6.json
index 933d3e47f47..95501d28e68 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-6.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-6.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-6",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.176",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-6.rennes.grid5000.fr",
+      "ip": "131.254.202.176",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-6.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.176",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-6-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.176",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-6-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-7.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-7.json
index 7a648026b3a..f50a2d07142 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-7.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-7.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-7",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.177",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-7.rennes.grid5000.fr",
+      "ip": "131.254.202.177",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-7.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.177",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-7-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.177",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-7-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-8.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-8.json
index b6701938d72..7b5885b1dce 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-8.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-8.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-8",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.178",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-8.rennes.grid5000.fr",
+      "ip": "131.254.202.178",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-8.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.178",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-8-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.178",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-8-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-9.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-9.json
index f57b1bd198f..48f2fd39959 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-9.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-9.json
@@ -1,83 +1,83 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "paramount-9",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "vendor": "Broadcom",
-      "mounted": true,
       "device": "eth0",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
-      "ip": "131.254.202.179",
+      "driver": "bnx2",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "network_address": "paramount-9.rennes.grid5000.fr",
+      "ip": "131.254.202.179",
       "management": false,
-      "driver": "bnx2",
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-9.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "c6509-grid",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Broadcom",
       "device": "eth1",
-      "version": "NetXtreme II BCM5708",
-      "rate": 1000000000,
+      "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5708"
     },
     {
-      "vendor": "Myrinet",
-      "mounted": true,
       "device": "myri0",
-      "version": "10G-PCIE-8A-C",
-      "rate": 10000000000,
-      "ip": "192.168.200.179",
       "enabled": true,
       "interface": "Myrinet",
-      "network_address": "paramount-9-myri0.rennes.grid5000.fr",
+      "ip": "192.168.200.179",
       "management": false,
-      "mountable": true
+      "mountable": true,
+      "mounted": true,
+      "network_address": "paramount-9-myri0.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
-      "raid": "0",
-      "size": 558793544769.287,
+      "driver": "megaraid_sas",
       "interface": "SATA",
-      "driver": "megaraid_sas"
+      "raid": "0",
+      "size": 558793544769.287
     }
   ],
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "cache_l2": null,
-    "version": "5148 LV",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "paramount-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/paramount.json b/data/grid5000/sites/rennes/clusters/paramount/paramount.json
index 959bf6b2ce9..3cbc5c2e21f 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/paramount.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/paramount.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
   "created_at": "Fri, 31 Aug 2007 22:00:00 GMT",
-  "uid": "paramount",
-  "model": "Dell PowerEdge 1950"
+  "model": "Dell PowerEdge 1950",
+  "type": "cluster",
+  "uid": "paramount"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
index 0dc88c78b8a..674f4e32cf7 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-1",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.221",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.221",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-1.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.221",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.221",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-1-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
index 58b163da2bc..1dd0e0edee6 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-10",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.230",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.230",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-10.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.230",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.230",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-10-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
index 1409dc13829..eea24086479 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-11",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.231",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.231",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-11.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.231",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.231",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-11-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
index 8bb3a7fd82d..045f2e87f93 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-12",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.232",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.232",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-12.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.232",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.232",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-12-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
index 855c30a7ef3..f7d2e18f45c 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-13",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.233",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.233",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-13.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.233",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.233",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-13-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json
index 2416b15c4ed..c7ffa51df28 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-14",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.234",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.234",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-14.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.234",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.234",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-14-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
index 156a7c45e44..99ec8730965 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-15",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.235",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.235",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-15.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.235",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.235",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-15-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
index c135007e594..a1d469e096a 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-16",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.236",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.236",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-16.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.236",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.236",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-16-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json
index 3c263f0329e..a62eac2ef6a 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-17",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.237",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.237",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-17.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.237",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.237",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-17-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
index a15a1cb6d1f..d8fb27fa4b3 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-18",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.238",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.238",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-18.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.238",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.238",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-18-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
index 8dc6ebc6e4c..d30364a897f 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-19",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.239",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.239",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-19.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.239",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.239",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-19-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
index e2663bdee24..b42fb7c15f9 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-2",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.222",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.222",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-2.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.222",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.222",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-2-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
index 3f4f43fc11d..701afecdb69 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-20",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.240",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.240",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-20.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.240",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.240",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-20-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
index 5d0c82bb8c2..60131260997 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-21",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.241",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.241",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-21.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.241",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.241",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-21-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json
index 62b66dab46e..f07fd8faba3 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-22",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.242",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.242",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-22.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.242",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.242",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-22-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json
index d23dd4e5922..0a19409f170 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-23",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.243",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.243",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-23.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.243",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.243",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-23-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
index afe516d3de0..e9300622b3d 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-24",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.244",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.244",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-24.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.244",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.244",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-24-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
index 7e91cf622a7..9153704448f 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-25",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.245",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.245",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-25.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.245",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.245",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-25-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
index 6551d81284d..e89788ca0cf 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-3",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.223",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.223",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-3.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.223",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.223",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-3-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
index 29ca5be5aff..d2dc146e908 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-4",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.224",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.224",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-4.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.224",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.224",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-4-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
index 4b89877f7eb..ba4c05f1561 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-5",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.225",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.225",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-5.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.225",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.225",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-5-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
index 11a97f52b00..67565d44899 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-6",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.226",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.226",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-6.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.226",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.226",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-6-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
index b0218421add..77561e39b14 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-7",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.227",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.227",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-7.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.227",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.227",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-7-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
index e717fcd67cf..e7992d3a3c3 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-8",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.228",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.228",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-8.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.228",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.228",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-8-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
index 557e38a5f82..f9d5de47534 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
@@ -1,79 +1,79 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapide-9",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": true,
       "device": "eth0",
-      "rate": 1000000000,
-      "ip": "131.254.202.229",
+      "driver": "igb",
       "enabled": true,
-      "switch": "c6509-grid",
       "interface": "Ethernet",
+      "ip": "131.254.202.229",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-9.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000,
+      "switch": "c6509-grid"
     },
     {
-      "mounted": false,
       "device": "eth1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb",
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.200.229",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.200.229",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapide-9-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2930000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "X5570"
   },
   "storage_devices": [
     {
-      "size": 465661287307.739,
+      "driver": "ahci",
       "interface": "SATA",
-      "driver": "ahci"
+      "size": 465661287307.739
     }
   ],
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
   },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2930000000.0,
-    "cache_l2": null,
-    "version": "X5570",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+  "type": "node",
+  "uid": "parapide-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/parapide.json b/data/grid5000/sites/rennes/clusters/parapide/parapide.json
index 04dea01bd16..6381433aabe 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/parapide.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/parapide.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
   "created_at": "Sun, 24 Jan 2010 23:00:00 GMT",
-  "uid": "parapide",
-  "model": "SUN FIRE X2270"
+  "model": "SUN FIRE X2270",
+  "type": "cluster",
+  "uid": "parapide"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
index d603dda0732..b98874562f1 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-1",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651KY"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:a9:23",
-      "rate": 1000000000,
-      "ip": "192.168.203.1",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-1-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.1",
+      "mac": "78:e7:d1:65:a9:23",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-1-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f5:ef:22",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:ef:22",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f5:ef:23",
-      "rate": 1000000000,
-      "ip": "131.254.203.1",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.1",
+      "mac": "78:e7:d1:f5:ef:23",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-1.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f5:3f:30",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:3f:30",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f5:3f:31",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:3f:31",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:0f",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.1",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.1",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:0f",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-1-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:10",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:10",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG2",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "GB0250EAFYK"
+      "interface": "SATA",
+      "model": "GB0250EAFYK",
+      "rev": "HPG2",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651KY"
-  }
+  "type": "node",
+  "uid": "parapluie-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
index 44db221853f..2da3cf3e18f 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-10",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651KK"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:58:23:f2",
-      "rate": 1000000000,
-      "ip": "192.168.203.10",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-10-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.10",
+      "mac": "78:e7:d1:58:23:f2",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-10-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "d8:d3:85:e6:a5:88",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:a5:88",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "d8:d3:85:e6:a5:89",
-      "rate": 1000000000,
-      "ip": "131.254.203.10",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.10",
+      "mac": "d8:d3:85:e6:a5:89",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-10.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "d8:d3:85:e6:a5:98",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:a5:98",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "d8:d3:85:e6:a5:99",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:a5:99",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:1b",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.10",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.10",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:1b",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-10-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:1c",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:1c",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG2",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "GB0250EAFYK"
+      "interface": "SATA",
+      "model": "GB0250EAFYK",
+      "rev": "HPG2",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651KK"
-  }
+  "type": "node",
+  "uid": "parapluie-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
index 432d08f72aa..b4d8703a61a 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-11",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651L5"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:a9:6e",
-      "rate": 1000000000,
-      "ip": "192.168.203.11",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-11-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.11",
+      "mac": "78:e7:d1:65:a9:6e",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-11-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f5:ee:f2",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:ee:f2",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f5:ee:f3",
-      "rate": 1000000000,
-      "ip": "131.254.203.11",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.11",
+      "mac": "78:e7:d1:f5:ee:f3",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-11.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f5:df:ac",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:df:ac",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f5:df:ad",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:df:ad",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:b9",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.11",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.11",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:b9",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-11-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:ba",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:ba",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651L5"
-  }
+  "type": "node",
+  "uid": "parapluie-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
index 0e6b52f8036..9cdf0195f1d 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-12",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651MC"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:f7:09:43",
-      "rate": 1000000000,
-      "ip": "192.168.203.12",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-12-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.12",
+      "mac": "78:e7:d1:f7:09:43",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-12-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f9:4e:c8",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:4e:c8",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f9:4e:c9",
-      "rate": 1000000000,
-      "ip": "131.254.203.12",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.12",
+      "mac": "78:e7:d1:f9:4e:c9",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-12.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f9:4e:d2",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:4e:d2",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f9:4e:d3",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:4e:d3",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:61",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.12",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.12",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:61",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-12-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:62",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:62",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651MC"
-  }
+  "type": "node",
+  "uid": "parapluie-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
index f7b799a73c0..17058a16834 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-13",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651MP"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:b9:a1",
-      "rate": 1000000000,
-      "ip": "192.168.203.13",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-13-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.13",
+      "mac": "78:e7:d1:65:b9:a1",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-13-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f9:7e:f0",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:7e:f0",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f9:7e:f1",
-      "rate": 1000000000,
-      "ip": "131.254.203.13",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.13",
+      "mac": "78:e7:d1:f9:7e:f1",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-13.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f9:7e:f4",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:7e:f4",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f9:7e:f5",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:7e:f5",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:69",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.13",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.13",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:69",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-13-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:6a",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:6a",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651MP"
-  }
+  "type": "node",
+  "uid": "parapluie-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
index 54474dd48d1..9abc15937a5 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-14",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651JY"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:58:33:67",
-      "rate": 1000000000,
-      "ip": "192.168.203.14",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-14-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.14",
+      "mac": "78:e7:d1:58:33:67",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-14-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:5d:0c:3e",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:5d:0c:3e",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:5d:0c:3f",
-      "rate": 1000000000,
-      "ip": "131.254.203.14",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.14",
+      "mac": "78:e7:d1:5d:0c:3f",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-14.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:5d:0c:18",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:5d:0c:18",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:5d:0c:19",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:5d:0c:19",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:65",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.14",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.14",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:65",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-14-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:66",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:66",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651JY"
-  }
+  "type": "node",
+  "uid": "parapluie-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
index 42b9dad8541..5e5683bec5b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-15",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651LD"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:99:f6",
-      "rate": 1000000000,
-      "ip": "192.168.203.15",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-15-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.15",
+      "mac": "78:e7:d1:65:99:f6",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-15-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f5:4f:04",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:4f:04",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f5:4f:05",
-      "rate": 1000000000,
-      "ip": "131.254.203.15",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.15",
+      "mac": "78:e7:d1:f5:4f:05",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-15.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f5:0f:be",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:0f:be",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f5:0f:bf",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:0f:bf",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:72:75",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.15",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.15",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:72:75",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-15-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:72:76",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:72:76",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651LD"
-  }
+  "type": "node",
+  "uid": "parapluie-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
index 45b0b72e566..beb9508446c 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-16",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651P6"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:f7:09:78",
-      "rate": 1000000000,
-      "ip": "192.168.203.16",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-16-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.16",
+      "mac": "78:e7:d1:f7:09:78",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-16-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:fa:03:78",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:fa:03:78",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:fa:03:79",
-      "rate": 1000000000,
-      "ip": "131.254.203.16",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.16",
+      "mac": "78:e7:d1:fa:03:79",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-16.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:fa:03:5a",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:fa:03:5a",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:fa:03:5b",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:fa:03:5b",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:51",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.16",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.16",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:51",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-16-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:52",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:52",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651P6"
-  }
+  "type": "node",
+  "uid": "parapluie-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
index fd79327ea6c..0371a9512f2 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-17",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651JT"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:c9:1b",
-      "rate": 1000000000,
-      "ip": "192.168.203.17",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-17-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.17",
+      "mac": "78:e7:d1:65:c9:1b",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-17-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f9:8e:32",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:8e:32",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f9:8e:33",
-      "rate": 1000000000,
-      "ip": "131.254.203.17",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.17",
+      "mac": "78:e7:d1:f9:8e:33",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-17.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f9:8e:46",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:8e:46",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f9:8e:47",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:8e:47",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:31",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.17",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.17",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:31",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-17-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:32",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:32",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651JT"
-  }
+  "type": "node",
+  "uid": "parapluie-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
index b560ee19c27..2dfbac10658 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-18",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651KF"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:58:23:db",
-      "rate": 1000000000,
-      "ip": "192.168.203.18",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-18-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.18",
+      "mac": "78:e7:d1:58:23:db",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-18-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "d8:d3:85:e6:a5:48",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:a5:48",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "d8:d3:85:e6:a5:49",
-      "rate": 1000000000,
-      "ip": "131.254.203.18",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.18",
+      "mac": "d8:d3:85:e6:a5:49",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-18.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "d8:d3:85:e6:a5:74",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:a5:74",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "d8:d3:85:e6:a5:75",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:a5:75",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:d9",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.18",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.18",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:d9",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-18-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:da",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:da",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG2",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "GB0250EAFYK"
+      "interface": "SATA",
+      "model": "GB0250EAFYK",
+      "rev": "HPG2",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651KF"
-  }
+  "type": "node",
+  "uid": "parapluie-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
index 01faff1f3b1..7e61230ee05 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-19",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651JB"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "1c:c1:de:7b:36:2e",
-      "rate": 1000000000,
-      "ip": "192.168.203.19",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-19-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.19",
+      "mac": "1c:c1:de:7b:36:2e",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-19-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "d4:85:64:45:b5:36",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d4:85:64:45:b5:36",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "d4:85:64:45:b5:37",
-      "rate": 1000000000,
-      "ip": "131.254.203.19",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.19",
+      "mac": "d4:85:64:45:b5:37",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-19.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "d4:85:64:45:a5:f4",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d4:85:64:45:a5:f4",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "d4:85:64:45:a5:f5",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d4:85:64:45:a5:f5",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:1d",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.19",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.19",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:1d",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-19-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:1e",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:1e",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651JB"
-  }
+  "type": "node",
+  "uid": "parapluie-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
index e1426697cc2..40efef5714b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-2",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651JH"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:58:23:dd",
-      "rate": 1000000000,
-      "ip": "192.168.203.2",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-2-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.2",
+      "mac": "78:e7:d1:58:23:dd",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-2-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "d8:d3:85:e6:a5:a2",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:a5:a2",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "d8:d3:85:e6:a5:a3",
-      "rate": 1000000000,
-      "ip": "131.254.203.2",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.2",
+      "mac": "d8:d3:85:e6:a5:a3",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-2.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "d8:d3:85:e6:a5:c4",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:a5:c4",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "d8:d3:85:e6:a5:c5",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:a5:c5",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:c9",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.2",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.2",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:c9",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-2-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:ca",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:ca",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651JH"
-  }
+  "type": "node",
+  "uid": "parapluie-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
index 626366ccacf..d5cfdace21a 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-20",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651J7"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:a9:27",
-      "rate": 1000000000,
-      "ip": "192.168.203.20",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-20-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.20",
+      "mac": "78:e7:d1:65:a9:27",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-20-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f5:fe:98",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:fe:98",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f5:fe:99",
-      "rate": 1000000000,
-      "ip": "131.254.203.20",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.20",
+      "mac": "78:e7:d1:f5:fe:99",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-20.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f5:ef:42",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:ef:42",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f5:ef:43",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:ef:43",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:19",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.20",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.20",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:19",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-20-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:1a",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:1a",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651J7"
-  }
+  "type": "node",
+  "uid": "parapluie-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
index 4875ac4b732..de6540315a0 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-21",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651PW"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:a9:3a",
-      "rate": 1000000000,
-      "ip": "192.168.203.21",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-21-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.21",
+      "mac": "78:e7:d1:65:a9:3a",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-21-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f5:de:b4",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:de:b4",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f5:de:b5",
-      "rate": 1000000000,
-      "ip": "131.254.203.21",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.21",
+      "mac": "78:e7:d1:f5:de:b5",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-21.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f5:df:80",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:df:80",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f5:df:81",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:df:81",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:35",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.21",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.21",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:35",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-21-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:36",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:36",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651PW"
-  }
+  "type": "node",
+  "uid": "parapluie-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
index ab7defab7d5..3af7765e64a 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-22",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651NB"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "1c:c1:de:7a:ac:4d",
-      "rate": 1000000000,
-      "ip": "192.168.203.22",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-22-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.22",
+      "mac": "1c:c1:de:7a:ac:4d",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-22-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "d4:85:64:43:5b:8c",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d4:85:64:43:5b:8c",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "d4:85:64:43:5b:8d",
-      "rate": 1000000000,
-      "ip": "131.254.203.22",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.22",
+      "mac": "d4:85:64:43:5b:8d",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-22.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "d4:85:64:43:5b:8a",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d4:85:64:43:5b:8a",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "d4:85:64:43:5b:8b",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d4:85:64:43:5b:8b",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:fd",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.22",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.22",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:fd",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-22-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:fe",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:fe",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651NB"
-  }
+  "type": "node",
+  "uid": "parapluie-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
index 4573df1583a..60140299174 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-23",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651P2"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:f7:09:69",
-      "rate": 1000000000,
-      "ip": "192.168.203.23",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-23-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.23",
+      "mac": "78:e7:d1:f7:09:69",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-23-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:fa:03:fa",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:fa:03:fa",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:fa:03:fb",
-      "rate": 1000000000,
-      "ip": "131.254.203.23",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.23",
+      "mac": "78:e7:d1:fa:03:fb",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-23.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:fa:13:4a",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:fa:13:4a",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:fa:13:4b",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:fa:13:4b",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:55",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.23",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.23",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:55",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-23-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:56",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:56",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651P2"
-  }
+  "type": "node",
+  "uid": "parapluie-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
index 70c8dcb2109..703b5214299 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-24",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651N6"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:f7:09:84",
-      "rate": 1000000000,
-      "ip": "192.168.203.24",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-24-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.24",
+      "mac": "78:e7:d1:f7:09:84",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-24-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:fa:03:44",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:fa:03:44",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:fa:03:45",
-      "rate": 1000000000,
-      "ip": "131.254.203.24",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.24",
+      "mac": "78:e7:d1:fa:03:45",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-24.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:fa:03:18",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:fa:03:18",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:fa:03:19",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:fa:03:19",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:45",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.24",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.24",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:45",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-24-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:46",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:46",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651N6"
-  }
+  "type": "node",
+  "uid": "parapluie-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
index 2b8440f9d8c..470da2f5563 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-25",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651MV"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:a9:4a",
-      "rate": 1000000000,
-      "ip": "192.168.203.25",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-25-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.25",
+      "mac": "78:e7:d1:65:a9:4a",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-25-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f9:5e:28",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:5e:28",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f9:5e:29",
-      "rate": 1000000000,
-      "ip": "131.254.203.25",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.25",
+      "mac": "78:e7:d1:f9:5e:29",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-25.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f9:5e:32",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:5e:32",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f9:5e:33",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:5e:33",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:24:3f",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.25",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.25",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:24:3f",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-25-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:24:40",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:24:40",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651MV"
-  }
+  "type": "node",
+  "uid": "parapluie-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
index cc4b3cba56c..b57de8ca730 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-26",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651LW"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:99:ff",
-      "rate": 1000000000,
-      "ip": "192.168.203.26",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-26-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.26",
+      "mac": "78:e7:d1:65:99:ff",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-26-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f5:0f:c6",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:0f:c6",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f5:0f:c7",
-      "rate": 1000000000,
-      "ip": "131.254.203.26",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.26",
+      "mac": "78:e7:d1:f5:0f:c7",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-26.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f6:a0:4e",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f6:a0:4e",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f6:a0:4f",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f6:a0:4f",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:1d",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.26",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.26",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:1d",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-26-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:1e",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:1e",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651LW"
-  }
+  "type": "node",
+  "uid": "parapluie-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
index 5d33609a6f0..4bc7020a409 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-27",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651M1"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:c9:48",
-      "rate": 1000000000,
-      "ip": "192.168.203.27",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-27-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.27",
+      "mac": "78:e7:d1:65:c9:48",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-27-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f9:3e:e2",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:3e:e2",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f9:3e:e3",
-      "rate": 1000000000,
-      "ip": "131.254.203.27",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.27",
+      "mac": "78:e7:d1:f9:3e:e3",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-27.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f9:4e:b0",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:4e:b0",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f9:4e:b1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:4e:b1",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:15",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.27",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.27",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:15",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-27-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:16",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:16",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651M1"
-  }
+  "type": "node",
+  "uid": "parapluie-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
index 43f43b7d3e8..f4f2411bb7b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-28",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651JD"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:c9:2d",
-      "rate": 1000000000,
-      "ip": "192.168.203.28",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-28-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.28",
+      "mac": "78:e7:d1:65:c9:2d",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-28-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f9:8e:52",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:8e:52",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f9:8e:53",
-      "rate": 1000000000,
-      "ip": "131.254.203.28",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.28",
+      "mac": "78:e7:d1:f9:8e:53",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-28.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f9:8e:4c",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:8e:4c",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f9:8e:4d",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:8e:4d",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e5",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.28",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.28",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e5",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-28-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e6",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e6",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651JD"
-  }
+  "type": "node",
+  "uid": "parapluie-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
index 5ba2d0a2b4d..146a2552d24 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-29",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651K4"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:58:33:77",
-      "rate": 1000000000,
-      "ip": "192.168.203.29",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-29-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.29",
+      "mac": "78:e7:d1:58:33:77",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-29-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "d8:d3:85:e6:d5:80",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:d5:80",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "d8:d3:85:e6:d5:81",
-      "rate": 1000000000,
-      "ip": "131.254.203.29",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.29",
+      "mac": "d8:d3:85:e6:d5:81",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-29.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "d8:d3:85:e6:c5:c6",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:c5:c6",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "d8:d3:85:e6:c5:c7",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:c5:c7",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e1",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.29",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.29",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e1",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-29-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e2",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e2",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651K4"
-  }
+  "type": "node",
+  "uid": "parapluie-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
index 89948cba306..4511284118d 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-3",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651K8"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:c9:2a",
-      "rate": 1000000000,
-      "ip": "192.168.203.3",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-3-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.3",
+      "mac": "78:e7:d1:65:c9:2a",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-3-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:fa:13:30",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:fa:13:30",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:fa:13:31",
-      "rate": 1000000000,
-      "ip": "131.254.203.3",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.3",
+      "mac": "78:e7:d1:fa:13:31",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-3.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:fa:13:26",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:fa:13:26",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:fa:13:27",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:fa:13:27",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:a9",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.3",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.3",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:a9",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-3-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:aa",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:aa",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651K8"
-  }
+  "type": "node",
+  "uid": "parapluie-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
index ba9700f261f..c5a2b7391d7 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-30",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651N2"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:b9:cf",
-      "rate": 1000000000,
-      "ip": "192.168.203.30",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-30-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.30",
+      "mac": "78:e7:d1:65:b9:cf",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-30-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f9:8e:04",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:8e:04",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f9:8e:05",
-      "rate": 1000000000,
-      "ip": "131.254.203.30",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.30",
+      "mac": "78:e7:d1:f9:8e:05",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-30.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f9:7e:d6",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:7e:d6",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f9:7e:d7",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:7e:d7",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:23:fb",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.30",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.30",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:23:fb",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-30-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:23:fc",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:23:fc",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651N2"
-  }
+  "type": "node",
+  "uid": "parapluie-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
index 3657e9dacbd..068f1fb9494 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-31",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651LJ"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:b9:4e",
-      "rate": 1000000000,
-      "ip": "192.168.203.31",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-31-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.31",
+      "mac": "78:e7:d1:65:b9:4e",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-31-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f9:be:38",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:be:38",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f9:be:39",
-      "rate": 1000000000,
-      "ip": "131.254.203.31",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.31",
+      "mac": "78:e7:d1:f9:be:39",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-31.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f9:be:3a",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:be:3a",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f9:be:3b",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:be:3b",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:35",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.31",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.31",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:35",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-31-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:36",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:36",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651LJ"
-  }
+  "type": "node",
+  "uid": "parapluie-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
index 7a187692043..91bb1d27ff8 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-32",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651L9"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:58:23:fc",
-      "rate": 1000000000,
-      "ip": "192.168.203.32",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-32-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.32",
+      "mac": "78:e7:d1:58:23:fc",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-32-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "d8:d3:85:e6:a5:6c",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:a5:6c",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "d8:d3:85:e6:a5:6d",
-      "rate": 1000000000,
-      "ip": "131.254.203.32",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.32",
+      "mac": "d8:d3:85:e6:a5:6d",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-32.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "d8:d3:85:e6:a5:4c",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:a5:4c",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "d8:d3:85:e6:a5:4d",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:a5:4d",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:59",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.32",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.32",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:59",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-32-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:5a",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:5a",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651L9"
-  }
+  "type": "node",
+  "uid": "parapluie-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
index c2e55b2eaf4..127d66b74f1 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-33",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651P9"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:a9:7a",
-      "rate": 1000000000,
-      "ip": "192.168.203.33",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-33-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.33",
+      "mac": "78:e7:d1:65:a9:7a",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-33-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f9:6f:52",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:6f:52",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f9:6f:53",
-      "rate": 1000000000,
-      "ip": "131.254.203.33",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.33",
+      "mac": "78:e7:d1:f9:6f:53",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-33.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f9:6f:54",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:6f:54",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f9:6f:55",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:6f:55",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:c3:d5",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.33",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.33",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:c3:d5",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-33-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:c3:d6",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:c3:d6",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651P9"
-  }
+  "type": "node",
+  "uid": "parapluie-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
index c019763f1f1..d0bd2c6738a 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-34",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651NV"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:b9:36",
-      "rate": 1000000000,
-      "ip": "192.168.203.34",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-34-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.34",
+      "mac": "78:e7:d1:65:b9:36",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-34-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f9:ae:80",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:ae:80",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f9:ae:81",
-      "rate": 1000000000,
-      "ip": "131.254.203.34",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.34",
+      "mac": "78:e7:d1:f9:ae:81",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-34.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f9:ae:7c",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:ae:7c",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f9:ae:7d",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:ae:7d",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:9d",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.34",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.34",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:9d",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-34-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:9e",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:9e",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651NV"
-  }
+  "type": "node",
+  "uid": "parapluie-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
index 3dd192bec8b..60c267eead4 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-35",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651PH"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:b9:72",
-      "rate": 1000000000,
-      "ip": "192.168.203.35",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-35-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.35",
+      "mac": "78:e7:d1:65:b9:72",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-35-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f9:ae:20",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:ae:20",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f9:ae:21",
-      "rate": 1000000000,
-      "ip": "131.254.203.35",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.35",
+      "mac": "78:e7:d1:f9:ae:21",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-35.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f9:ae:3c",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:ae:3c",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f9:ae:3d",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:ae:3d",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:07:50:19",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.35",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.35",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:07:50:19",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-35-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:07:50:1a",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:07:50:1a",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651PH"
-  }
+  "type": "node",
+  "uid": "parapluie-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
index 875affdc509..08376a8fc18 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-36",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651NR"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:b9:fb",
-      "rate": 1000000000,
-      "ip": "192.168.203.36",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-36-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.36",
+      "mac": "78:e7:d1:65:b9:fb",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-36-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f9:8e:72",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:8e:72",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f9:8e:73",
-      "rate": 1000000000,
-      "ip": "131.254.203.36",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.36",
+      "mac": "78:e7:d1:f9:8e:73",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-36.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f9:8e:a0",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:8e:a0",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f9:8e:a1",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:8e:a1",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:59",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.36",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.36",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:59",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-36-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:5a",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:5a",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651NR"
-  }
+  "type": "node",
+  "uid": "parapluie-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
index 17c20355497..900d41eadc3 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-37",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651P3"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:f7:09:42",
-      "rate": 1000000000,
-      "ip": "192.168.203.37",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-37-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.37",
+      "mac": "78:e7:d1:f7:09:42",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-37-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f9:3e:f8",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:3e:f8",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f9:3e:f9",
-      "rate": 1000000000,
-      "ip": "131.254.203.37",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.37",
+      "mac": "78:e7:d1:f9:3e:f9",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-37.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f9:3e:fa",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:3e:fa",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f9:3e:fb",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:3e:fb",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:41",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.37",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.37",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:41",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-37-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:42",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:42",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651P3"
-  }
+  "type": "node",
+  "uid": "parapluie-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
index 46acf15febf..095aa2313f8 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-38",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651M7"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:a9:0f",
-      "rate": 1000000000,
-      "ip": "192.168.203.38",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-38-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.38",
+      "mac": "78:e7:d1:65:a9:0f",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-38-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f5:3f:5a",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:3f:5a",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f5:3f:5b",
-      "rate": 1000000000,
-      "ip": "131.254.203.38",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.38",
+      "mac": "78:e7:d1:f5:3f:5b",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-38.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f5:fe:ee",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:fe:ee",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f5:fe:ef",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:fe:ef",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:21",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.38",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.38",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:21",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-38-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:22",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:22",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651M7"
-  }
+  "type": "node",
+  "uid": "parapluie-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
index 0ffd5e6c6fd..4c871518276 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-39",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651NW"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:b9:65",
-      "rate": 1000000000,
-      "ip": "192.168.203.39",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-39-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.39",
+      "mac": "78:e7:d1:65:b9:65",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-39-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f9:ae:40",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:ae:40",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f9:ae:41",
-      "rate": 1000000000,
-      "ip": "131.254.203.39",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.39",
+      "mac": "78:e7:d1:f9:ae:41",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-39.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f9:ae:44",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:ae:44",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f9:ae:45",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:ae:45",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:29",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.39",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.39",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:29",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-39-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:2a",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:2a",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651NW"
-  }
+  "type": "node",
+  "uid": "parapluie-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
index 338a73166b0..4e26441197f 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-4",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651NH"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:c9:4f",
-      "rate": 1000000000,
-      "ip": "192.168.203.4",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-4-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.4",
+      "mac": "78:e7:d1:65:c9:4f",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-4-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f9:5e:34",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:5e:34",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f9:5e:35",
-      "rate": 1000000000,
-      "ip": "131.254.203.4",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.4",
+      "mac": "78:e7:d1:f9:5e:35",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-4.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f9:5e:58",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:5e:58",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f9:5e:59",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:5e:59",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:49",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.4",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.4",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:49",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-4-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4a",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4a",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651NH"
-  }
+  "type": "node",
+  "uid": "parapluie-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
index abb1ec7745f..eb2071532b6 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-40",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651KS"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:58:33:0b",
-      "rate": 1000000000,
-      "ip": "192.168.203.40",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-40-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.40",
+      "mac": "78:e7:d1:58:33:0b",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-40-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "d8:d3:85:e6:a5:e2",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:a5:e2",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "d8:d3:85:e6:a5:e3",
-      "rate": 1000000000,
-      "ip": "131.254.203.40",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.40",
+      "mac": "d8:d3:85:e6:a5:e3",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-40.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "d8:d3:85:e6:a5:ec",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:a5:ec",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "d8:d3:85:e6:a5:ed",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:a5:ed",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:37:1f",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.40",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.40",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:37:1f",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-40-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:37:20",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:37:20",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG2",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "GB0250EAFYK"
+      "interface": "SATA",
+      "model": "GB0250EAFYK",
+      "rev": "HPG2",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651KS"
-  }
+  "type": "node",
+  "uid": "parapluie-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
index 67c55230e26..7f470c26e0a 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-5",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651PN"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:58:33:1d",
-      "rate": 1000000000,
-      "ip": "192.168.203.5",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-5-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.5",
+      "mac": "78:e7:d1:58:33:1d",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-5-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:5d:2c:44",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:5d:2c:44",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:5d:2c:45",
-      "rate": 1000000000,
-      "ip": "131.254.203.5",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.5",
+      "mac": "78:e7:d1:5d:2c:45",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-5.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:5d:2c:34",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:5d:2c:34",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:5d:2c:35",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:5d:2c:35",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:49",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.5",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.5",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:49",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-5-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:4a",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:4a",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651PN"
-  }
+  "type": "node",
+  "uid": "parapluie-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
index 8977a084bb0..51593c3a437 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-6",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651NM"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:58:33:50",
-      "rate": 1000000000,
-      "ip": "192.168.203.6",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-6-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.6",
+      "mac": "78:e7:d1:58:33:50",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-6-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "d8:d3:85:e6:95:e8",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:95:e8",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "d8:d3:85:e6:95:e9",
-      "rate": 1000000000,
-      "ip": "131.254.203.6",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.6",
+      "mac": "d8:d3:85:e6:95:e9",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-6.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "d8:d3:85:e6:95:ec",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:95:ec",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "d8:d3:85:e6:95:ed",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "d8:d3:85:e6:95:ed",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:39",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.6",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.6",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:39",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-6-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:3a",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:3a",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651NM"
-  }
+  "type": "node",
+  "uid": "parapluie-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
index 591ac974309..1c96967c288 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-7",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651J9"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:99:eb",
-      "rate": 1000000000,
-      "ip": "192.168.203.7",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-7-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.7",
+      "mac": "78:e7:d1:65:99:eb",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-7-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f5:0f:38",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:0f:38",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f5:0f:39",
-      "rate": 1000000000,
-      "ip": "131.254.203.7",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.7",
+      "mac": "78:e7:d1:f5:0f:39",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-7.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f5:ef:88",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:ef:88",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f5:ef:89",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f5:ef:89",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:4d",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.7",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.7",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:4d",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-7-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:4e",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:4e",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651J9"
-  }
+  "type": "node",
+  "uid": "parapluie-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
index e0e2bfaa109..621d3654778 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-8",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651MH"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:c9:56",
-      "rate": 1000000000,
-      "ip": "192.168.203.8",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-8-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.8",
+      "mac": "78:e7:d1:65:c9:56",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-8-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f9:4e:d6",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:4e:d6",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f9:4e:d7",
-      "rate": 1000000000,
-      "ip": "131.254.203.8",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.8",
+      "mac": "78:e7:d1:f9:4e:d7",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-8.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f9:4e:fa",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:4e:fa",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f9:4e:fb",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:4e:fb",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4d",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.8",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.8",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4d",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-8-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4e",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4e",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651MH"
-  }
+  "type": "node",
+  "uid": "parapluie-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
index b2003530007..6f8afd5745a 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
@@ -1,128 +1,128 @@
 {
-  "type": "node",
-  "operating_system": {
-    "kernel": "2.6.26",
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "parapluie-9",
   "architecture": {
+    "platform_type": "amd64",
     "smp_size": 2,
-    "smt_size": 24,
-    "platform_type": "amd64"
+    "smt_size": 24
+  },
+  "bios": {
+    "release_date": "09/06/2010",
+    "vendor": "HP",
+    "version": "O37"
+  },
+  "chassis": {
+    "serial_number": "GB803651P0"
+  },
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
   "network_adapters": [
     {
-      "mounted": false,
       "device": "bmc",
-      "mac": "78:e7:d1:65:b9:e1",
-      "rate": 1000000000,
-      "ip": "192.168.203.9",
       "enabled": true,
       "interface": "Ethernet",
-      "network_address": "parapluie-9-bmc.rennes.grid5000.fr",
+      "ip": "192.168.203.9",
+      "mac": "78:e7:d1:65:b9:e1",
       "management": true,
-      "mountable": false
+      "mountable": false,
+      "mounted": false,
+      "network_address": "parapluie-9-bmc.rennes.grid5000.fr",
+      "rate": 1000000000
     },
     {
       "device": "eth0",
-      "mac": "78:e7:d1:f9:8e:f6",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:8e:f6",
+      "rate": 1000000000
     },
     {
-      "mounted": true,
       "device": "eth1",
-      "mac": "78:e7:d1:f9:8e:f7",
-      "rate": 1000000000,
-      "ip": "131.254.203.9",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "131.254.203.9",
+      "mac": "78:e7:d1:f9:8e:f7",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-9.rennes.grid5000.fr",
-      "driver": "igb",
-      "mountable": true
+      "rate": 1000000000
     },
     {
       "device": "eth2",
-      "mac": "78:e7:d1:f9:8e:e4",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:8e:e4",
+      "rate": 1000000000
     },
     {
       "device": "eth3",
-      "mac": "78:e7:d1:f9:8e:e5",
-      "rate": 1000000000,
+      "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "driver": "igb"
+      "mac": "78:e7:d1:f9:8e:e5",
+      "rate": 1000000000
     },
     {
-      "vendor": "Mellanox",
-      "mounted": true,
       "device": "ib0",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:21",
-      "version": "MT25418",
-      "rate": 10000000000,
-      "ip": "192.168.201.9",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband",
+      "ip": "192.168.201.9",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:21",
+      "mountable": true,
+      "mounted": true,
       "network_address": "parapluie-9-ib0.rennes.grid5000.fr",
-      "driver": "mlx4_core",
-      "mountable": true
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     },
     {
-      "vendor": "Mellanox",
       "device": "ib1",
-      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:22",
-      "version": "MT25418",
-      "rate": 10000000000,
+      "driver": "mlx4_core",
       "enabled": false,
       "interface": "Infiniband",
-      "driver": "mlx4_core"
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:22",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "MT25418"
     }
   ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+  "operating_system": {
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 1700000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "6164 HE"
   },
   "storage_devices": [
     {
-      "rev": "HPG0",
       "device": "sda",
-      "size": 250059350016,
-      "interface": "SATA",
       "driver": "ahci",
-      "model": "VB0250EAVER"
+      "interface": "SATA",
+      "model": "VB0250EAVER",
+      "rev": "HPG0",
+      "size": 250059350016
     }
   ],
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
-  },
-  "bios": {
-    "vendor": "HP",
-    "version": "O37",
-    "release_date": "09/06/2010"
-  },
-  "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 1700000000.0,
-    "cache_l2": null,
-    "version": "6164 HE",
-    "instruction_set": "",
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
   },
-  "chassis": {
-    "serial_number": "GB803651P0"
-  }
+  "type": "node",
+  "uid": "parapluie-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json b/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json
index 5cdd944a557..056d5116f6b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
   "created_at": "Mon, 01 Nov 2010 23:00:00 GMT",
-  "uid": "parapluie",
-  "model": "HP ProLiant DL165 G7"
+  "model": "HP ProLiant DL165 G7",
+  "type": "cluster",
+  "uid": "parapluie"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/rennes.json b/data/grid5000/sites/rennes/rennes.json
index 73ad759b9f2..c589b942030 100755
--- a/data/grid5000/sites/rennes/rennes.json
+++ b/data/grid5000/sites/rennes/rennes.json
@@ -1,15 +1,15 @@
 {
-  "type": "site",
-  "user_support_contact": "rennes-staff@lists.grid5000.fr",
-  "latitude": 48.1,
-  "uid": "rennes",
-  "longitude": -1.6667,
   "compilation_server": false,
+  "description": "",
   "email_contact": "rennes-staff@lists.grid5000.fr",
-  "sys_admin_contact": "rennes-staff@lists.grid5000.fr",
-  "name": "Rennes",
+  "latitude": 48.1,
   "location": "Rennes, France",
-  "description": "",
+  "longitude": -1.6667,
+  "name": "Rennes",
   "security_contact": "rennes-staff@lists.grid5000.fr",
+  "sys_admin_contact": "rennes-staff@lists.grid5000.fr",
+  "type": "site",
+  "uid": "rennes",
+  "user_support_contact": "rennes-staff@lists.grid5000.fr",
   "web": "http://www.irisa.fr"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/helios.json b/data/grid5000/sites/sophia/clusters/helios/helios.json
index c63b946425a..692bfa57c49 100755
--- a/data/grid5000/sites/sophia/clusters/helios/helios.json
+++ b/data/grid5000/sites/sophia/clusters/helios/helios.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
   "created_at": "Thu, 01 Jun 2006 22:00:00 GMT",
-  "uid": "helios",
-  "model": "Sun Fire X4100"
+  "model": "Sun Fire X4100",
+  "type": "cluster",
+  "uid": "helios"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
index 6e94b48b2fe..c355dd8770f 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-1",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.1",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.1",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-1.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-1.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.73",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.73",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-1-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-1-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
index 90a2cd27d05..c031f705443 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-10",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.10",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.10",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-10.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-10.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.82",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.82",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-10-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-10-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
index 06e075f2237..fbd98cc2ef2 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-11",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.11",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.11",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-11.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-11.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.83",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.83",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-11-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-11-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
index 0528c0b57b3..86ad83c27e7 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-12",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.12",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.12",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-12.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-12.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.84",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.84",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-12-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-12-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
index 31a28d57aee..274b527ea30 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-13",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.13",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.13",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-13.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-13.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.85",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.85",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-13-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-13-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
index 93b1e932294..853da05135e 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-14",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.14",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.14",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-14.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-14.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.86",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.86",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-14-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-14-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
index c8e0a3dd427..f42cfc03ce0 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-15",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.15",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.15",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-15.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-15.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.87",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.87",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-15-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-15-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
index 1fb4ffea4c5..32f085e3508 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-16",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.16",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.16",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-16.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-16.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.88",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.88",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-16-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-16-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
index 03aed287cf0..036afac23b0 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-17",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.17",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.17",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-17.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-17.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.89",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.89",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-17-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-17-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
index bca74ddb070..32ae7dcd601 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-18",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.18",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.18",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-18.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-18.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.90",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.90",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-18-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-18-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
index bcfda324baf..1ba0028dd3d 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-19",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.19",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.19",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-19.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-19.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.91",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.91",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-19-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-19-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
index 4d1cd1e6d3b..43318f025ee 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-2",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.2",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.2",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-2.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-2.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.74",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.74",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-2-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-2-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
index 014598e434d..53f49c84bd6 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-20",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.20",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.20",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-20.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-20.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.92",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.92",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-20-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-20-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
index f93e65e7e91..24bdfa7e385 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-21",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.21",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.21",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-21.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-21.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.93",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.93",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-21-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-21-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
index 87197797d79..e882616d665 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-22",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.22",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.22",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-22.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-22.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.94",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.94",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-22-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-22-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
index 76e19be1ba8..568d154ccce 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-23",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.23",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.23",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-23.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-23.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.95",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.95",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-23-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-23-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
index c72b8450a65..823be14b6f6 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-24",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.24",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.24",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-24.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-24.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.96",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.96",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-24-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-24-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
index 2aae774b4f9..85a504431f5 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-25",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.25",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.25",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-25.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-25.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.97",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.97",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-25-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-25-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
index 3f868bfdea9..38d8d0e9f64 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-26",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.26",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.26",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-26.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-26.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.98",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.98",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-26-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-26-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
index 330dc15a5c8..de680cb8b12 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-27",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.27",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.27",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-27.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-27.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.99",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.99",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-27-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-27-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
index 6f34cfe1dd4..6fb5d108f62 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-28",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.28",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.28",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-28.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-28.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.100",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.100",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-28-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-28-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
index 62c4f9ab515..e31af02a6bc 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-29",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.29",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.29",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-29.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-29.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.101",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.101",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-29-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-29-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
index be56aab0277..0591b1259b1 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-3",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.3",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.3",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-3.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-3.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.75",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.75",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-3-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-3-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
index d5860d5bf7e..2f9c73a6d4b 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-30",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.30",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.30",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-30.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-30.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.102",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.102",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-30-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-30-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
index 99e703463d6..b29fe022552 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-31",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.31",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.31",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-31.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-31.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.103",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.103",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-31-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-31-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
index 8fb97749d1c..d3aac504033 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-32",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.32",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.32",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-32.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-32.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.104",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.104",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-32-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-32-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
index 935325ecab0..956b49c7a6d 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-33",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.33",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.33",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-33.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-33.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.105",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.105",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-33-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-33-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
index 06ff4b36ada..4b56ce695e0 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-34",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.34",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.34",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-34.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-34.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.106",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.106",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-34-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-34-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
index ff01263148e..f87e4997613 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-35",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.35",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.35",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-35.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-35.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.107",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.107",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-35-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-35-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
index 3e6c7c365b2..0852432a552 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-36",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.36",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.36",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-36.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-36.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.108",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.108",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-36-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-36-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
index bfd34ce6e15..9734c73dd27 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-37",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.37",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.37",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-37.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-37.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.109",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.109",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-37-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-37-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
index 41b6edca228..01dde4db110 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-38",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.38",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.38",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-38.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-38.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.110",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.110",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-38-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-38-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
index 8164dac491f..8cd8459a22d 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-39",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.39",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.39",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-39.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-39.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.111",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.111",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-39-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-39-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
index ca810038d13..a71a79bb38f 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-4",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.4",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.4",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-4.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-4.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.76",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.76",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-4-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-4-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
index 8b41c090d09..28d931fb04b 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-40",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.40",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.40",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-40.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-40.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.112",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.112",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-40-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-40-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
index bf7ab2970f0..626073635e8 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-41",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.41",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.41",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-41.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-41.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.113",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.113",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-41-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-41-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
index b66eaa020cd..18fef186069 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-42",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.42",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.42",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-42.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-42.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.114",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.114",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-42-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-42-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
index 35ae8aa3d6a..2545796af5c 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-43",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.43",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.43",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-43.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-43.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.115",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.115",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-43-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-43-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
index 1601e379073..227bb3deced 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-44",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.44",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.44",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-44.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-44.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.116",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.116",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-44-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-44-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
index 9afcda270d8..3872f6065b7 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-45",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.45",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.45",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-45.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-45.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.117",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.117",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-45-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-45-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
index b5c73f98027..4458abf87d8 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-46",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.46",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.46",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-46.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-46.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.118",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.118",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-46-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-46-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
index 08f0f9a0b2f..618af4f3e90 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-47",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.47",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.47",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-47.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-47.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.119",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.119",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-47-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-47-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
index ce09a6eb095..948baff93cc 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-48",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.48",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.48",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-48.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-48.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.120",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.120",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-48-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-48-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
index 8f61d05eb6f..86efe651d9a 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-49",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.49",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.49",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-49.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-49.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.121",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.121",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-49-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-49-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
index 439c108d798..d3037d85632 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-5",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.5",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.5",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-5.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-5.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.77",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.77",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-5-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-5-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
index 9f82e436e33..158dafeea92 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-50",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.50",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.50",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-50.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-50.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.122",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.122",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-50-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-50-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
index b1b6e087e14..6c09e8a4c00 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-51",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.51",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.51",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-51.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-51.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.123",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.123",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-51-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-51-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
index 0902de40efa..c82e73b62a8 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-52",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.52",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.52",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-52.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-52.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.124",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.124",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-52-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-52-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
index 6f524d29353..b15f4eb888d 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-53",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.53",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.53",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-53.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-53.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.125",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.125",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-53-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-53-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
index fd5af8616b9..258a6035064 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-54",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.54",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.54",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-54.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-54.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.126",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.126",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-54-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-54-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
index 43f566f5154..eebb2ad648e 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-55",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.55",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.55",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-55.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-55.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.127",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.127",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-55-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-55-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
index b85d6c5cc1b..1dee162b2f5 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-56",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.56",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.56",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-56.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-56.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.128",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.128",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-56-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-56-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
index 9c56c7792f4..0dec999be13 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-6",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.6",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.6",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-6.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-6.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.78",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.78",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-6-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-6-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
index 53292239515..fba770f99bf 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-7",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.7",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.7",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-7.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-7.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.79",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.79",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-7-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-7-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
index b28b92f83c2..b04513f92a6 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-8",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.8",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.8",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-8.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-8.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.80",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.80",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-8-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-8-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
index ec176be61bc..88a8ee99a5f 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
@@ -1,34 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "helios-9",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    },
-    {
-      "interface": "SAS",
-      "raid": "0",
-      "driver": "mptsas",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "virtual": false,
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -36,77 +10,103 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Intel Corporation",
-      "mac": null,
-      "ip": "138.96.21.9",
+      "driver": "e1000",
       "enabled": true,
-      "version": "82546EB",
       "interface": "Ethernet",
+      "ip": "138.96.21.9",
+      "mac": null,
       "management": false,
-      "driver": "e1000",
-      "network_address": "helios-9.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-9.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth2",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 1000000000,
       "device": "eth3",
-      "vendor": "Intel Corporation",
-      "mac": null,
+      "driver": "e1000",
       "enabled": false,
-      "version": "82546EB",
       "interface": "Ethernet",
-      "driver": "e1000"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Intel Corporation",
+      "version": "82546EB"
     },
     {
-      "rate": 2000000000,
       "device": "myri0",
-      "vendor": "Myricom",
-      "mac": null,
-      "ip": "192.168.7.81",
+      "driver": "mx",
       "enabled": true,
-      "version": "M3F-PCIXF-2",
       "interface": "Myrinet",
+      "ip": "192.168.7.81",
+      "mac": null,
       "management": false,
-      "switch": "edgeiron48gs",
-      "driver": "mx",
-      "network_address": "helios-9-myri0.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "helios-9-myri0.sophia.grid5000.fr",
+      "rate": 2000000000,
+      "switch": "edgeiron48gs",
+      "vendor": "Myricom",
+      "version": "M3F-PCIXF-2"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "275",
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "275"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    },
+    {
+      "driver": "mptsas",
+      "interface": "SAS",
+      "raid": "0",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "helios-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
index 5a6575effc5..f3e8e2e2b34 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-1",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.1",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.1",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-1.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-1.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
index 1b1511cd7fe..21441eb18b7 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-10",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.10",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.10",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-10.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-10.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
index e5bfab9e0b1..4bd530b52d9 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-11",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.11",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.11",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-11.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-11.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
index 4c31d66a08b..61ffdacefc9 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-12",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.12",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.12",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-12.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-12.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
index 4d19c4f1d45..d946fc782cd 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-13",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.13",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.13",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-13.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-13.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
index 056e46f8a9c..b0716e0f431 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-14",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.14",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.14",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-14.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-14.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
index 27217a9b672..0b6ee4cf24f 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-15",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.15",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.15",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-15.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-15.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
index c326c45eaf4..5904ec77e8e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-16",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.16",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.16",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-16.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-16.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
index bf0228f1d74..52fdcb03e5c 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-17",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.17",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.17",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-17.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-17.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
index 42fe048819a..227ad4a4f4c 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-18",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.18",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.18",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-18.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-18.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
index 8c26728ca43..873533eca51 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-19",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.19",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.19",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-19.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-19.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
index ba6bfdbab73..fcf22b30275 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-2",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.2",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.2",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-2.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-2.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
index e7817dbe3b3..115db114c12 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-20",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.20",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.20",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-20.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-20.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
index 766d0006cdc..69abb209ed0 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-21",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.21",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.21",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-21.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-21.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
index 3c029a2568e..5d65de3eee7 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-22",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.22",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.22",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-22.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-22.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
index bd1e0344d9c..b4103910f16 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-23",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.23",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.23",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-23.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-23.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
index 3a7ee0d94fc..d43a5bc46db 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-24",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.24",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.24",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-24.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-24.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
index c53d1688da7..8454235967c 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-25",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.25",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.25",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-25.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-25.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
index e15aacf854d..bd77e136b13 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-26",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.26",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.26",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-26.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-26.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
index b4340b1f268..1650770c262 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-27",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.27",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.27",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-27.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-27.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
index 5a98da56c44..8ea322309e6 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-28",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.28",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.28",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-28.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-28.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
index 07dcdd4897f..3bbdec755b8 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-29",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.29",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.29",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-29.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-29.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
index 5cef5384db4..a961602974a 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-3",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.3",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.3",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-3.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-3.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
index 0b5d3f9d67b..0e502a02e5e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-30",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.30",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.30",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-30.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-30.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
index 9dbd49630de..e5b65a99dd5 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-31",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.31",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.31",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-31.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-31.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
index 9a2d68bc24a..1ed03a80cdd 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-32",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.32",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.32",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-32.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-32.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
index d3888344950..752562001d6 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-33",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.33",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.33",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-33.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-33.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
index 30daac8b3bf..1f2a3e6de63 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-34",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.34",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.34",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-34.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-34.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
index 548fccce5a3..d5903091cea 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-35",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.35",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.35",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-35.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-35.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
index 2bf6ead21bd..b8ab7a9a9cb 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-36",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.36",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.36",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-36.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-36.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
index 367b190be12..432113c1f18 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-37",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.37",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.37",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-37.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-37.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
index 49d088e8e48..f2288f3c29b 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-38",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.38",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.38",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-38.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-38.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
index c1c9f64720d..6d45bc147ed 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-39",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.39",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.39",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-39.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-39.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
index 2e986eb585e..463901af293 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-4",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.4",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.4",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-4.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-4.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
index 9a2a3124293..66a4a9ad047 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-40",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.40",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.40",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-40.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-40.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
index 3616f8b9949..3e06c26cd44 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-41",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.41",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.41",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-41.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-41.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
index 3b434ed2e28..a4695978ced 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-42",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.42",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.42",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-42.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-42.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
index bc4a980297c..2653a95a56d 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-43",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.43",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.43",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-43.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-43.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
index 113f96a7434..d301f8682f7 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-44",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.44",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.44",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-44.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-44.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
index 033b4c4c4e2..235da71a642 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-45",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.45",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.45",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-45.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-45.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
index 1c8f4b8ba02..b10e1e81df0 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-46",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.46",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.46",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-46.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-46.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
index 1758395cc65..41b05b43481 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-47",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.47",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.47",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-47.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-47.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
index 4ff48cc0328..622a475791f 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-48",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.48",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.48",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-48.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-48.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
index 21f23f262d9..9af56e12969 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-49",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.49",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.49",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-49.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-49.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
index 29510397105..199c08c3a73 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-5",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.5",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.5",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-5.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-5.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
index 601dfc1a288..1fc58640c3b 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-50",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.50",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.50",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-50.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-50.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
index a99f970ac75..fbd942fbe78 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-6",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.6",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.6",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-6.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-6.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
index 52506fe95a3..eb59864502b 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-7",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.7",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.7",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-7.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-7.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
index 39dd8fed779..8902d2d1c31 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-8",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.8",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.8",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-8.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-8.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
index a8d2bdd4ff1..62b3c040c79 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
@@ -1,27 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "sol-9",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "amd-v",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 4294967296,
@@ -29,60 +10,79 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "nVidia",
-      "mac": null,
-      "ip": "138.96.22.9",
+      "driver": "forcedeth",
       "enabled": true,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
+      "ip": "138.96.22.9",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "forcedeth",
-      "network_address": "sol-9.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "sol-9.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "nVidia",
-      "mac": null,
+      "driver": "forcedeth",
       "enabled": false,
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "driver": "forcedeth"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "nVidia",
+      "version": "MCP55 Pro"
     },
     {
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
-    },
-    {
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
-      "mac": null,
+      "version": "BCM5715c"
+    },
+    {
+      "driver": "tg3",
       "enabled": false,
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "driver": "tg3"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "AMD",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2600000000.0,
+    "cache_l1i": null,
     "cache_l2": 1048576,
-    "version": "2218",
+    "clock_speed": 2600000000.0,
     "instruction_set": "",
+    "model": "AMD Opteron",
     "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron"
-  }
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "sol-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/sol.json b/data/grid5000/sites/sophia/clusters/sol/sol.json
index 94c006450c0..f7e56849f03 100755
--- a/data/grid5000/sites/sophia/clusters/sol/sol.json
+++ b/data/grid5000/sites/sophia/clusters/sol/sol.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
   "created_at": "Thu, 22 Feb 2007 23:00:00 GMT",
-  "uid": "sol",
-  "model": "Sun Fire X2200 M2"
+  "model": "Sun Fire X2200 M2",
+  "type": "cluster",
+  "uid": "sol"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
index 4475dcc1a3e..03928a20865 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-1",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.101",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.101",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-1.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-1.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
index 18ab3ab16d2..dd83aa19274 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-10",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.110",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.110",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-10.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-10.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
index fa100356c29..65c47dbe6cb 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-11",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.111",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.111",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-11.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-11.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
index a541741c068..2dfab89ef45 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-12",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.112",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.112",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-12.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-12.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
index b19c7c1ff8d..c2152a408a5 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-13",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.113",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.113",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-13.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-13.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
index ec4d60c9be6..48b6ed4bd5e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-14",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.114",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.114",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-14.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-14.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
index 3ead411d41c..2daf0b37d83 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-15",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.115",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.115",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-15.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-15.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
index bdac3f56a1d..181850ef5dd 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-16",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.116",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.116",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-16.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-16.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
index 13a78158351..e6edfa463cf 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-17",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.117",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.117",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-17.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-17.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
index b8ea8c4280d..8733fa36203 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-18",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.118",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.118",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-18.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-18.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
index c83a680457a..0a8846f1992 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-19",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.119",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.119",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-19.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-19.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
index 0f50df20c92..f9ee756aa11 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-2",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.102",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.102",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-2.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-2.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
index a823f06581f..3465183a094 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-20",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.120",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.120",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-20.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-20.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
index 6700ae48461..af617cda08a 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-21",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.121",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.121",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-21.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-21.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
index 55dd9364f21..3d6de7da81d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-22",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.122",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.122",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-22.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-22.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
index 0e40a65e092..cf3d1b5b024 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-23",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.123",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.123",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-23.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-23.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
index 24b4e8e4e69..80937631b82 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-24",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.124",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.124",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-24.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-24.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
index 494e8ca2c77..7cbfa8cb54b 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-25",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.125",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.125",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-25.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-25.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
index 1d599b557b1..eb03153c3df 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-26",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.126",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.126",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-26.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-26.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
index 36fea0dc17a..57dea573a80 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-27",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.127",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.127",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-27.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-27.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
index fcf3a3d9af7..185ec58dd73 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-28",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.128",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.128",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-28.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-28.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
index a0fc3fbf539..4cf6ca94eec 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-29",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.129",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.129",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-29.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-29.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
index fd59eb43863..4bf111279b5 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-3",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.103",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.103",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-3.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-3.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
index 8ab4fbbc415..b29c6032c2f 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-30",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.130",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.130",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-30.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-30.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
index f4b5b744b3f..8ab3524068e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-31",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.131",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.131",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-31.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-31.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
index 9f77e46eaa5..06797a9bb09 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-32",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.132",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.132",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-32.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-32.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
index e5ec413e90b..8a19d2b801e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-33",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.133",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.133",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-33.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-33.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
index 98e7fce65a7..f03a0179a99 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-34",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.134",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.134",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-34.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-34.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
index 629f9e9b9f9..135b97b7f4a 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-35",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.135",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.135",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-35.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-35.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
index dbf24951bca..0fac1435c0c 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-36",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.136",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.136",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-36.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-36.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
index 0a7d66cba03..d3fe6169bbd 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-37",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.137",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.137",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-37.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-37.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
index 3adad4933f7..a6217efc109 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-38",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.138",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.138",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-38.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-38.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
index e57d571074d..b361c478b36 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-39",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.139",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.139",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-39.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-39.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
index ae3f61c178c..07998958c54 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-4",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.104",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.104",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-4.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-4.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
index e8bc67fe780..4fe9136ceb9 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-40",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.140",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.140",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-40.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-40.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
index eaf201516c6..df69b064554 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-41",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.141",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.141",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-41.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-41.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
index 6900977ee48..cc7466ef6c2 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-42",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.142",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.142",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-42.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-42.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
index 0b1c96bc03b..7be9e2b832e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-43",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.143",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.143",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-43.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-43.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
index 4b203ba6ded..1eb08bda16f 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-44",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.144",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.144",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-44.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-44.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
index b9b78bd3a2e..9693dee6556 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-45",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.145",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.145",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-45.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-45.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
index 0834a34afb9..6c11d958585 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-5",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.105",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.105",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-5.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-5.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
index 99d9a4a0825..d09c450436a 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-6",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.106",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.106",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-6.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-6.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
index cd7e804ee43..8612f4d0cfd 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-7",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.107",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.107",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-7.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-7.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
index 65a830990bc..9e1cb1db064 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-8",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.108",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.108",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-8.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-8.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
index 20bab2fc1a5..5a669976057 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
@@ -1,28 +1,8 @@
 {
-  "type": "node",
-  "operating_system": {
-    "version": null,
-    "name": "Debian",
-    "release": "5.0"
-  },
-  "uid": "suno-9",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "raid": "0",
-      "driver": "megaraid_sas",
-      "size": 557675957679.749
-    }
-  ],
-  "supported_job_types": {
-    "virtual": "ivt",
-    "deploy": true,
-    "besteffort": true
+    "smt_size": 8
   },
   "main_memory": {
     "ram_size": 34359738368,
@@ -30,42 +10,62 @@
   },
   "network_adapters": [
     {
-      "rate": 1000000000,
       "device": "eth0",
-      "vendor": "Broadcom",
-      "mac": null,
-      "ip": "138.96.21.109",
+      "driver": "bnx2",
       "enabled": true,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
+      "ip": "138.96.21.109",
+      "mac": null,
       "management": false,
-      "switch": "fastiron",
-      "driver": "bnx2",
-      "network_address": "suno-9.sophia.grid5000.fr",
       "mountable": true,
-      "mounted": true
+      "mounted": true,
+      "network_address": "suno-9.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "fastiron",
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     },
     {
-      "rate": 1000000000,
       "device": "eth1",
-      "vendor": "Broadcom",
-      "mac": null,
+      "driver": "bnx2",
       "enabled": false,
-      "version": "NetXtremeII BCM5716",
       "interface": "Ethernet",
-      "driver": "bnx2"
+      "mac": null,
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "NetXtremeII BCM5716"
     }
   ],
+  "operating_system": {
+    "name": "Debian",
+    "release": "5.0",
+    "version": null
+  },
   "processor": {
-    "cache_l1i": null,
-    "vendor": "Intel",
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2260000000.0,
+    "cache_l1i": null,
     "cache_l2": 8388608,
-    "version": "E5520",
+    "clock_speed": 2260000000.0,
     "instruction_set": "",
+    "model": "Intel Xeon",
     "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon"
-  }
+    "vendor": "Intel",
+    "version": "E5520"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 557675957679.749
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "suno-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/suno.json b/data/grid5000/sites/sophia/clusters/suno/suno.json
index 10c0fef19c6..d57815127d5 100644
--- a/data/grid5000/sites/sophia/clusters/suno/suno.json
+++ b/data/grid5000/sites/sophia/clusters/suno/suno.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
   "created_at": "Tue, 26 Jan 2010 23:00:00 GMT",
-  "uid": "suno",
-  "model": "Dell PowerEdge R410"
+  "model": "Dell PowerEdge R410",
+  "type": "cluster",
+  "uid": "suno"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/sophia.json b/data/grid5000/sites/sophia/sophia.json
index 337b547680a..a731e14d563 100755
--- a/data/grid5000/sites/sophia/sophia.json
+++ b/data/grid5000/sites/sophia/sophia.json
@@ -1,15 +1,15 @@
 {
-  "type": "site",
-  "user_support_contact": "sophia-staff@lists.grid5000.fr",
-  "latitude": 43.6161,
-  "uid": "sophia",
-  "longitude": 7.0678,
   "compilation_server": false,
+  "description": "",
   "email_contact": "sophia-staff@lists.grid5000.fr",
-  "sys_admin_contact": "sophia-staff@lists.grid5000.fr",
-  "name": "Sophia-Antipolis",
+  "latitude": 43.6161,
   "location": "Sophia-Antipolis, France",
-  "description": "",
+  "longitude": 7.0678,
+  "name": "Sophia-Antipolis",
   "security_contact": "sophia-staff@lists.grid5000.fr",
+  "sys_admin_contact": "sophia-staff@lists.grid5000.fr",
+  "type": "site",
+  "uid": "sophia",
+  "user_support_contact": "sophia-staff@lists.grid5000.fr",
   "web": null
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json
index 7e2b4748bf9..bdecabd9e58 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-1",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:E0:82:92",
-      "ip": "172.16.113.1",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.1",
+      "ip6": null,
+      "mac": "00:16:36:E0:82:92",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-1.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-1.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:82:93",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:E0:82:93",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:8E:3E",
-      "ip": "192.168.24.1",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.1",
+      "ip6": null,
+      "mac": "00:16:36:E0:8E:3E",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-1-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-1-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json
index 2423bded369..8ab0e3063ff 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-10",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:E0:80:1A",
-      "ip": "172.16.113.10",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.10",
+      "ip6": null,
+      "mac": "00:16:36:E0:80:1A",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-10.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-10.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:80:1B",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:E0:80:1B",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:8E:8D",
-      "ip": "192.168.24.10",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.10",
+      "ip6": null,
+      "mac": "00:16:36:E0:8E:8D",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-10-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-10-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
index 2f7b96183de..3bb154b331f 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-11",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:D2:EF:48",
-      "ip": "172.16.113.11",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.11",
+      "ip6": null,
+      "mac": "00:16:36:D2:EF:48",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-11.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-11.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:EF:49",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:D2:EF:49",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:DF:0A:99",
-      "ip": "192.168.24.11",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.11",
+      "ip6": null,
+      "mac": "00:16:36:DF:0A:99",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-11-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-11-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
index 3f69b46bb4f..aaba91f990e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-12",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F7:13",
-      "ip": "172.16.113.12",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.12",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F7:13",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-12.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-12.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F7:14",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F7:14",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:EC",
-      "ip": "192.168.24.12",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.12",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:EC",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-12-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-12-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json
index 3856937fd2c..9c361e3dbd9 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-13",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:E0:79:C2",
-      "ip": "172.16.113.13",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.13",
+      "ip6": null,
+      "mac": "00:16:36:E0:79:C2",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-13.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-13.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:79:C3",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:E0:79:C3",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:8C:16",
-      "ip": "192.168.24.13",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.13",
+      "ip6": null,
+      "mac": "00:16:36:E0:8C:16",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-13-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-13-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json
index 623537ea9a0..eac841ea4da 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-14",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:D2:F1:C4",
-      "ip": "172.16.113.14",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.14",
+      "ip6": null,
+      "mac": "00:16:36:D2:F1:C4",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-14.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-14.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:F1:C5",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:D2:F1:C5",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:F8:1C",
-      "ip": "192.168.24.14",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.14",
+      "ip6": null,
+      "mac": "00:16:36:D2:F8:1C",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-14-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-14-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json
index c352c6d282a..8b97161107b 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-15",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:7B:46:51",
-      "ip": "172.16.113.15",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.15",
+      "ip6": null,
+      "mac": "00:16:36:7B:46:51",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-15.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-15.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:7B:46:52",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:7B:46:52",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:7B:48:7C",
-      "ip": "192.168.24.15",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.15",
+      "ip6": null,
+      "mac": "00:16:36:7B:48:7C",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-15-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-15-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json
index 967499954dc..853190919a4 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-16",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:DF:09:0E",
-      "ip": "172.16.113.16",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.16",
+      "ip6": null,
+      "mac": "00:16:36:DF:09:0E",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-16.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-16.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:DF:09:0F",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:DF:09:0F",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:DF:0A:74",
-      "ip": "192.168.24.16",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.16",
+      "ip6": null,
+      "mac": "00:16:36:DF:0A:74",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-16-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-16-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json
index 756b5f8947b..134a3e8325f 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-17",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F5:C3",
-      "ip": "172.16.113.17",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.17",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F5:C3",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-17.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-17.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F5:C4",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F5:C4",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FD:4A",
-      "ip": "192.168.24.17",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.17",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FD:4A",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-17-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-17-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json
index 3c2cc3ec7cc..8129f5a4758 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-18",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:D2:F0:40",
-      "ip": "172.16.113.18",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.18",
+      "ip6": null,
+      "mac": "00:16:36:D2:F0:40",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-18.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-18.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:F0:41",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:D2:F0:41",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:F7:A0",
-      "ip": "192.168.24.18",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.18",
+      "ip6": null,
+      "mac": "00:16:36:D2:F7:A0",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-18-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-18-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json
index fe0b0ce0146..1e8ec66c98c 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-19",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:D7:4D:40",
-      "ip": "172.16.113.19",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.19",
+      "ip6": null,
+      "mac": "00:16:36:D7:4D:40",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-19.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-19.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D7:4D:41",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:D7:4D:41",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D7:5B:DC",
-      "ip": "192.168.24.19",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.19",
+      "ip6": null,
+      "mac": "00:16:36:D7:5B:DC",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-19-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-19-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json
index 1293560bc94..cb9f3be51ed 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-2",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F8:83",
-      "ip": "172.16.113.2",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.2",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F8:83",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-2.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-2.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F8:84",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F8:84",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:4C",
-      "ip": "192.168.24.2",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.2",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:4C",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-2-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-2-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json
index f02ea79aa09..404ec3429db 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-20",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:D7:4E:F4",
-      "ip": "172.16.113.20",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.20",
+      "ip6": null,
+      "mac": "00:16:36:D7:4E:F4",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-20.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-20.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D7:4E:F5",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:D7:4E:F5",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D7:5C:C2",
-      "ip": "192.168.24.20",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.20",
+      "ip6": null,
+      "mac": "00:16:36:D7:5C:C2",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-20-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-20-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json
index ffae11bf7d5..095bf416f0e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-21",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:3D:CA:9D",
-      "ip": "172.16.113.21",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.21",
+      "ip6": null,
+      "mac": "00:1B:24:3D:CA:9D",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-21.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-21.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:3D:CA:9E",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:3D:CA:9E",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:3D:CB:95",
-      "ip": "192.168.24.21",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.21",
+      "ip6": null,
+      "mac": "00:1B:24:3D:CB:95",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-21-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-21-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json
index 7b93c292b96..94a6a5299e4 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-22",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F8:63",
-      "ip": "172.16.113.22",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.22",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F8:63",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-22.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-22.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F8:64",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F8:64",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:69",
-      "ip": "192.168.24.22",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.22",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:69",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-22-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-22-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json
index 659efbe58e4..5ff51e2f444 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-23",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F6:E7",
-      "ip": "172.16.113.23",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.23",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F6:E7",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-23.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-23.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F6:E8",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:E8",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:E0",
-      "ip": "192.168.24.23",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.23",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:E0",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-23-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-23-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json
index 965194a1b54..1511a1aaed6 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-24",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:FA:7F",
-      "ip": "172.16.113.24",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.24",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FA:7F",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-24.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-24.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FA:80",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FA:80",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FB:ED",
-      "ip": "192.168.24.24",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.24",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FB:ED",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-24-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-24-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json
index 97706ce1ca2..db690cbcfcd 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-25",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:FA:43",
-      "ip": "172.16.113.25",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.25",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FA:43",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-25.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-25.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FA:44",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FA:44",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:12",
-      "ip": "192.168.24.25",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.25",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:12",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-25-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-25-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json
index d00c2362758..0442cd2761b 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-26",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F7:B3",
-      "ip": "172.16.113.26",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.26",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F7:B3",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-26.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-26.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F7:B4",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F7:B4",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:9B",
-      "ip": "192.168.24.26",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.26",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:9B",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-26-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-26-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
index d49834bee09..c8d7136dc48 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-27",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F8:37",
-      "ip": "172.16.113.27",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.27",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F8:37",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-27.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-27.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F8:38",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F8:38",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:61",
-      "ip": "192.168.24.27",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.27",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:61",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-27-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-27-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json
index 46d1cc24fd5..54b039d1712 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-28",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:D2:EC:D0",
-      "ip": "172.16.113.28",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.28",
+      "ip6": null,
+      "mac": "00:16:36:D2:EC:D0",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-28.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-28.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:EC:D1",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:D2:EC:D1",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:F7:01",
-      "ip": "192.168.24.28",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.28",
+      "ip6": null,
+      "mac": "00:16:36:D2:F7:01",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-28-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-28-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json
index d34ae40bd3b..658ec7059b1 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-29",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F5:BF",
-      "ip": "172.16.113.29",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.29",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F5:BF",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-29.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-29.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F5:C0",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F5:C0",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FD:49",
-      "ip": "192.168.24.29",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.29",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FD:49",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-29-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-29-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json
index 0b2c25cc151..125192a1c28 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-3",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:DF:09:12",
-      "ip": "172.16.113.3",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.3",
+      "ip6": null,
+      "mac": "00:16:36:DF:09:12",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-3.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-3.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:DF:09:13",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:DF:09:13",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:DF:0A:75",
-      "ip": "192.168.24.3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.3",
+      "ip6": null,
+      "mac": "00:16:36:DF:0A:75",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-3-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-3-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json
index e09e865c3b0..1db6a1a7b11 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-30",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:DF:08:C2",
-      "ip": "172.16.113.30",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.30",
+      "ip6": null,
+      "mac": "00:16:36:DF:08:C2",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-30.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-30.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:DF:08:C3",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:DF:08:C3",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:F7:A3",
-      "ip": "192.168.24.30",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.30",
+      "ip6": null,
+      "mac": "00:16:36:D2:F7:A3",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-30-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-30-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json
index 815b3f8386f..d17151b5f04 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-31",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:D2:F3:58",
-      "ip": "172.16.113.31",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.31",
+      "ip6": null,
+      "mac": "00:16:36:D2:F3:58",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-31.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-31.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:F3:59",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:D2:F3:59",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:F8:50",
-      "ip": "192.168.24.31",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.31",
+      "ip6": null,
+      "mac": "00:16:36:D2:F8:50",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-31-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-31-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json
index 3a20d92bf85..e46d661926f 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-32",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:E0:78:92",
-      "ip": "172.16.113.32",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.32",
+      "ip6": null,
+      "mac": "00:16:36:E0:78:92",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-32.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-32.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:78:93",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:E0:78:93",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:8B:CA",
-      "ip": "192.168.24.32",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.32",
+      "ip6": null,
+      "mac": "00:16:36:E0:8B:CA",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-32-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-32-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
index 501f7236ee5..4ff0616f76a 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-33",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:E0:79:5E",
-      "ip": "172.16.113.33",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.33",
+      "ip6": null,
+      "mac": "00:16:36:E0:79:5E",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-33.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-33.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:79:5F",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:E0:79:5F",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:8B:FD",
-      "ip": "192.168.24.33",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.33",
+      "ip6": null,
+      "mac": "00:16:36:E0:8B:FD",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-33-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-33-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json
index 1a301ed8f59..ce9c54cc7cf 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-34",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:E0:81:D6",
-      "ip": "172.16.113.34",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.34",
+      "ip6": null,
+      "mac": "00:16:36:E0:81:D6",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-34.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-34.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:81:D7",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:E0:81:D7",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:8E:12",
-      "ip": "192.168.24.34",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.34",
+      "ip6": null,
+      "mac": "00:16:36:E0:8E:12",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-34-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-34-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json
index 10a14af46bd..6b1f3317859 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-35",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F6:83",
-      "ip": "172.16.113.35",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.35",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F6:83",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-35.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-35.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F6:84",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:84",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FD:07",
-      "ip": "192.168.24.35",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.35",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FD:07",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-35-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-35-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json
index 0d9a0e633ca..9fa0a93c456 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-36",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F7:17",
-      "ip": "172.16.113.36",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.36",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F7:17",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-36.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-36.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F7:18",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F7:18",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:ED",
-      "ip": "192.168.24.36",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.36",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:ED",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-36-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-36-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
index e57bad57abb..449bfe3a8da 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-37",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F6:47",
-      "ip": "172.16.113.37",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.37",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F6:47",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-37.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-37.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F6:48",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:48",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FD:11",
-      "ip": "192.168.24.37",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.37",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FD:11",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-37-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-37-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json
index cb2b699d55e..8584476d0f7 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-38",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:DF:09:0A",
-      "ip": "172.16.113.38",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.38",
+      "ip6": null,
+      "mac": "00:16:36:DF:09:0A",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-38.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-38.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:DF:09:0B",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:DF:09:0B",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:F6:E1",
-      "ip": "192.168.24.38",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.38",
+      "ip6": null,
+      "mac": "00:16:36:D2:F6:E1",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-38-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-38-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json
index 9460b876c74..2dbf8190484 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-39",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:D2:F0:3C",
-      "ip": "172.16.113.39",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.39",
+      "ip6": null,
+      "mac": "00:16:36:D2:F0:3C",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-39.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-39.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:F0:3D",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:D2:F0:3D",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:F7:9F",
-      "ip": "192.168.24.39",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.39",
+      "ip6": null,
+      "mac": "00:16:36:D2:F7:9F",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-39-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-39-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
index 96a95edab4e..07f3bec2f79 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-4",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:E0:7E:D6",
-      "ip": "172.16.113.4",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.4",
+      "ip6": null,
+      "mac": "00:16:36:E0:7E:D6",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-4.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-4.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:7E:D7",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:E0:7E:D7",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:8D:40",
-      "ip": "192.168.24.4",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.4",
+      "ip6": null,
+      "mac": "00:16:36:E0:8D:40",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-4-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-4-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json
index ab04158d13c..521661f837b 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-40",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:D2:EF:44",
-      "ip": "172.16.113.40",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.40",
+      "ip6": null,
+      "mac": "00:16:36:D2:EF:44",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-40.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-40.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:EF:45",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:D2:EF:45",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:DF:0A:97",
-      "ip": "192.168.24.40",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.40",
+      "ip6": null,
+      "mac": "00:16:36:DF:0A:97",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-40-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-40-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json
index c3b61312f7c..41899b57a8f 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-41",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:E0:78:36",
-      "ip": "172.16.113.41",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.41",
+      "ip6": null,
+      "mac": "00:16:36:E0:78:36",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-41.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-41.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:78:37",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:E0:78:37",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:8B:B3",
-      "ip": "192.168.24.41",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.41",
+      "ip6": null,
+      "mac": "00:16:36:E0:8B:B3",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-41-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-41-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
index 3af86755c07..563a07d1d02 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-42",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:E0:79:6A",
-      "ip": "172.16.113.42",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.42",
+      "ip6": null,
+      "mac": "00:16:36:E0:79:6A",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-42.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-42.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:79:6B",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:E0:79:6B",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:8C:00",
-      "ip": "192.168.24.42",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.42",
+      "ip6": null,
+      "mac": "00:16:36:E0:8C:00",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-42-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-42-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
index 699cdcafb8a..5e92395580e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-43",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:D2:F3:9C",
-      "ip": "172.16.113.43",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.43",
+      "ip6": null,
+      "mac": "00:16:36:D2:F3:9C",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-43.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-43.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:F3:9D",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:D2:F3:9D",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:DF:0A:D4",
-      "ip": "192.168.24.43",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.43",
+      "ip6": null,
+      "mac": "00:16:36:DF:0A:D4",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-43-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-43-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json
index 72587001146..e8448e1ace5 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-44",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F8:F3",
-      "ip": "172.16.113.44",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.44",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F8:F3",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-44.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-44.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F8:F4",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F8:F4",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:40",
-      "ip": "192.168.24.44",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.44",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:40",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-44-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-44-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
index 85a26547ec4..eb5d430d144 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-45",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F6:9F",
-      "ip": "172.16.113.45",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.45",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F6:9F",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-45.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-45.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F6:A0",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:A0",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FD:1A",
-      "ip": "192.168.24.45",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.45",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FD:1A",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-45-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-45-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json
index e0bacd3b82b..5ebcb181ba6 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-46",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:FA:A3",
-      "ip": "172.16.113.46",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.46",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FA:A3",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-46.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-46.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FA:A4",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FA:A4",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FB:F8",
-      "ip": "192.168.24.46",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.46",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FB:F8",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-46-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-46-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
index 367ce8621b5..14ba629825d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-47",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:FA:3F",
-      "ip": "172.16.113.47",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.47",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FA:3F",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-47.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-47.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FA:40",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FA:40",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:11",
-      "ip": "192.168.24.47",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.47",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:11",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-47-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-47-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
index efd87590ecf..161b38507d4 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-48",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F6:AB",
-      "ip": "172.16.113.48",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.48",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F6:AB",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-48.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-48.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F6:AC",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:AC",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FD:20",
-      "ip": "192.168.24.48",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.48",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FD:20",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-48-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-48-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json
index 0cc8d09847e..ab6dbaefe0d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-49",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F6:4B",
-      "ip": "172.16.113.49",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.49",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F6:4B",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-49.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-49.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F6:4C",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:4C",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FD:13",
-      "ip": "192.168.24.49",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.49",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FD:13",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-49-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-49-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
index fec4a972846..a608222d105 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-5",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:E0:78:2E",
-      "ip": "172.16.113.5",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.5",
+      "ip6": null,
+      "mac": "00:16:36:E0:78:2E",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-5.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-5.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:78:2F",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:E0:78:2F",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:8B:B1",
-      "ip": "192.168.24.5",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.5",
+      "ip6": null,
+      "mac": "00:16:36:E0:8B:B1",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-5-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-5-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json
index 98b313a08dc..1af258982e3 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-50",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:E7:78:05",
-      "ip": "172.16.113.50",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.50",
+      "ip6": null,
+      "mac": "00:16:36:E7:78:05",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-50.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-50.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E7:78:06",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:E7:78:06",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E7:80:A6",
-      "ip": "192.168.24.50",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.50",
+      "ip6": null,
+      "mac": "00:16:36:E7:80:A6",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-50-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-50-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json
index fce1655f571..366ffeb206c 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-51",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F9:BF",
-      "ip": "172.16.113.51",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.51",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F9:BF",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-51.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-51.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F9:C0",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F9:C0",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:C2",
-      "ip": "192.168.24.51",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.51",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:C2",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-51-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-51-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json
index 87449b7a45a..36c53873fe4 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-52",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F8:CB",
-      "ip": "172.16.113.52",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.52",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F8:CB",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-52.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-52.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F8:CC",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F8:CC",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:36",
-      "ip": "192.168.24.52",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.52",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:36",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-52-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-52-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json
index 13a23a6cc80..e445f7eb091 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-53",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F6:63",
-      "ip": "172.16.113.53",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.53",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F6:63",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-53.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-53.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F6:64",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:64",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FD:1B",
-      "ip": "192.168.24.53",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.53",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FD:1B",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-53-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-53-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json
index a02d1d584e5..38b30642b3b 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-54",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F8:8B",
-      "ip": "172.16.113.54",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.54",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F8:8B",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-54.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-54.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F8:8C",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F8:8C",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:4E",
-      "ip": "192.168.24.54",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.54",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:4E",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-54-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-54-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json
index d65c37d74c0..38f3d9682ee 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-55",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F9:D7",
-      "ip": "172.16.113.55",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.55",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F9:D7",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-55.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-55.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F9:D8",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F9:D8",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:C9",
-      "ip": "192.168.24.55",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.55",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:C9",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-55-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-55-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json
index 8900eb96ac4..d41ba93f3c4 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-56",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:B9:DB",
-      "ip": "172.16.113.56",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.56",
+      "ip6": null,
+      "mac": "00:1B:24:2D:B9:DB",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-56.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-56.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:B9:DC",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B9:DC",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:C1:2D",
-      "ip": "192.168.24.56",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.56",
+      "ip6": null,
+      "mac": "00:1B:24:2D:C1:2D",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-56-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-56-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json
index a49b98d0214..0b18a32f23c 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-57",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:B9:0B",
-      "ip": "172.16.113.57",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.57",
+      "ip6": null,
+      "mac": "00:1B:24:2D:B9:0B",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-57.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-57.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:B9:0C",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B9:0C",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:C0:F9",
-      "ip": "192.168.24.57",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.57",
+      "ip6": null,
+      "mac": "00:1B:24:2D:C0:F9",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-57-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-57-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-57"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json
index 35723f106a6..aea0da2b8a6 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-58",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:B9:13",
-      "ip": "172.16.113.58",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.58",
+      "ip6": null,
+      "mac": "00:1B:24:2D:B9:13",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-58.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-58.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:B9:14",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B9:14",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:C0:FB",
-      "ip": "192.168.24.58",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.58",
+      "ip6": null,
+      "mac": "00:1B:24:2D:C0:FB",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-58-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-58-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-58"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json
index 521ab0911cb..1032eee562d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-59",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F7:07",
-      "ip": "172.16.113.59",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.59",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F7:07",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-59.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-59.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F7:08",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F7:08",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:E9",
-      "ip": "192.168.24.59",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.59",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:E9",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-59-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-59-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-59"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
index 76dd66b375d..6cd20517355 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-6",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:D2:EE:F8",
-      "ip": "172.16.113.6",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.6",
+      "ip6": null,
+      "mac": "00:16:36:D2:EE:F8",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-6.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-6.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:EE:F9",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:D2:EE:F9",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:F7:DD",
-      "ip": "192.168.24.6",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.6",
+      "ip6": null,
+      "mac": "00:16:36:D2:F7:DD",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-6-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-6-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
index 209d9982a7d..ec5a6094ad6 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-60",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F6:3B",
-      "ip": "172.16.113.60",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.60",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F6:3B",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-60.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-60.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F6:3C",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:3C",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FD:0D",
-      "ip": "192.168.24.60",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.60",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FD:0D",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-60-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-60-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-60"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
index 54a3de0b1bd..b747dc6622a 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-61",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F7:C7",
-      "ip": "172.16.113.61",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.61",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F7:C7",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-61.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-61.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F7:C8",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F7:C8",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:9E",
-      "ip": "192.168.24.61",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.61",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:9E",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-61-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-61-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-61"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json
index 2d9e01dbbe6..ff7604a768d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-62",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F7:9B",
-      "ip": "172.16.113.62",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.62",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F7:9B",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-62.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-62.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F7:9C",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F7:9C",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:94",
-      "ip": "192.168.24.62",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.62",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:94",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-62-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-62-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-62"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json
index fa6c1212506..c2314652dd7 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-63",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:B7:17",
-      "ip": "172.16.113.63",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.63",
+      "ip6": null,
+      "mac": "00:1B:24:2D:B7:17",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-63.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-63.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:B7:18",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B7:18",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:C0:54",
-      "ip": "192.168.24.63",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.63",
+      "ip6": null,
+      "mac": "00:1B:24:2D:C0:54",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-63-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-63-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-63"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json
index 3080fcb9f05..d56a9fbec87 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-64",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:23:8B:8A:36:69",
-      "ip": "172.16.113.64",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.64",
+      "ip6": null,
+      "mac": "00:23:8B:8A:36:69",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-64.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-64.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:23:8B:8A:36:6A",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:23:8B:8A:36:6A",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:23:8B:8A:34:4E",
-      "ip": "192.168.24.64",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.64",
+      "ip6": null,
+      "mac": "00:23:8B:8A:34:4E",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-64-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-64-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-64"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
index 8359fc2e87e..648c21509f3 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-65",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": null,
-      "ip": "172.16.113.65",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.65",
+      "ip6": null,
+      "mac": null,
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-65.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-65.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": null,
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": null,
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:1D:EE:58",
-      "ip": "192.168.24.65",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.65",
+      "ip6": null,
+      "mac": "00:1B:24:1D:EE:58",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-65-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-65-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-65"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json
index 9425fa692d8..f22f67f2d1a 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-66",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F7:9F",
-      "ip": "172.16.113.66",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.66",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F7:9F",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-66.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-66.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F7:A0",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F7:A0",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:98",
-      "ip": "192.168.24.66",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.66",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:98",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-66-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-66-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-66"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json
index 713df8e06cd..190f1570a8f 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-67",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F8:D3",
-      "ip": "172.16.113.67",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.67",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F8:D3",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-67.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-67.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F8:D4",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F8:D4",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:38",
-      "ip": "192.168.24.67",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.67",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:38",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-67-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-67-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-67"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json
index fc475c6a93d..f45dba54e9f 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-68",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:E0:56:D7",
-      "ip": "172.16.113.68",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.68",
+      "ip6": null,
+      "mac": "00:1B:24:E0:56:D7",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-68.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-68.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:E0:56:D8",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:E0:56:D8",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:E0:57:D2",
-      "ip": "192.168.24.68",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.68",
+      "ip6": null,
+      "mac": "00:1B:24:E0:57:D2",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-68-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-68-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-68"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
index 1558608302d..2f950c3cd98 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-69",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F9:F7",
-      "ip": "172.16.113.69",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.69",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F9:F7",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-69.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-69.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F9:F8",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F9:F8",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:D4",
-      "ip": "192.168.24.69",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.69",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:D4",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-69-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-69-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-69"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
index e32a468d27f..e489a5963ce 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-7",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:D2:EF:38",
-      "ip": "172.16.113.7",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.7",
+      "ip6": null,
+      "mac": "00:16:36:D2:EF:38",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-7.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-7.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:EF:39",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:D2:EF:39",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:DF:0A:6E",
-      "ip": "192.168.24.7",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.7",
+      "ip6": null,
+      "mac": "00:16:36:DF:0A:6E",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-7-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-7-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
index 78909f381bc..354b9215d1e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-70",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:B6:23",
-      "ip": "172.16.113.70",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.70",
+      "ip6": null,
+      "mac": "00:1B:24:2D:B6:23",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-70.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-70.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:B6:24",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B6:24",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:BF:EF",
-      "ip": "192.168.24.70",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.70",
+      "ip6": null,
+      "mac": "00:1B:24:2D:BF:EF",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-70-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-70-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-70"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json
index 7ff79625026..cd36bd5235a 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-71",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F8:A7",
-      "ip": "172.16.113.71",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.71",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F8:A7",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-71.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-71.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F8:A8",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F8:A8",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:55",
-      "ip": "192.168.24.71",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.71",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:55",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-71-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-71-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-71"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json
index 69044d654f4..6f9b763617e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-72",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:B8:97",
-      "ip": "172.16.113.72",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.72",
+      "ip6": null,
+      "mac": "00:1B:24:2D:B8:97",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-72.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-72.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:B8:98",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B8:98",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:C0:3D",
-      "ip": "192.168.24.72",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.72",
+      "ip6": null,
+      "mac": "00:1B:24:2D:C0:3D",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-72-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-72-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-72"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json
index 62744e3a13f..8c356195501 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-73",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:B6:FF",
-      "ip": "172.16.113.73",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.73",
+      "ip6": null,
+      "mac": "00:1B:24:2D:B6:FF",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-73.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-73.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:B7:00",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B7:00",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:C0:4E",
-      "ip": "192.168.24.73",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.73",
+      "ip6": null,
+      "mac": "00:1B:24:2D:C0:4E",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-73-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-73-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-73"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json
index 973e73c2a1a..8a6241c0791 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-74",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:FF:D6:02",
-      "ip": "172.16.113.74",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.74",
+      "ip6": null,
+      "mac": "00:16:36:FF:D6:02",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-74.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-74.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:FF:D6:03",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:FF:D6:03",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:FF:D9:BE",
-      "ip": "192.168.24.74",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.74",
+      "ip6": null,
+      "mac": "00:16:36:FF:D9:BE",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-74-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-74-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-74"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
index e79697f1a51..06720c67c2f 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-75",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F6:EB",
-      "ip": "172.16.113.75",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.75",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F6:EB",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-75.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-75.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F6:EC",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:EC",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FC:E1",
-      "ip": "192.168.24.75",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.75",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FC:E1",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-75-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-75-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-75"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json
index 436abe8d5ac..3c6c686080e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-76",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:B9:17",
-      "ip": "172.16.113.76",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.76",
+      "ip6": null,
+      "mac": "00:1B:24:2D:B9:17",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-76.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-76.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:B9:18",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B9:18",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:C0:FC",
-      "ip": "192.168.24.76",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.76",
+      "ip6": null,
+      "mac": "00:1B:24:2D:C0:FC",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-76-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-76-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-76"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
index af370d08dd5..4f6cc300cb3 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-77",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:B7:1B",
-      "ip": "172.16.113.77",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.77",
+      "ip6": null,
+      "mac": "00:1B:24:2D:B7:1B",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-77.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-77.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:B7:1C",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B7:1C",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:C0:55",
-      "ip": "192.168.24.77",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.77",
+      "ip6": null,
+      "mac": "00:1B:24:2D:C0:55",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-77-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-77-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-77"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
index 21944b60529..05b119993a5 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-78",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:1B:24:2D:F6:B3",
-      "ip": "172.16.113.78",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.78",
+      "ip6": null,
+      "mac": "00:1B:24:2D:F6:B3",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-78.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-78.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:F6:B4",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:B4",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:1B:24:2D:FD:22",
-      "ip": "192.168.24.78",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.78",
+      "ip6": null,
+      "mac": "00:1B:24:2D:FD:22",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-78-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-78-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-78"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json
index 05248a3d3bd..0bd366b5b53 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-79",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:D2:EE:2C",
-      "ip": "172.16.113.79",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.79",
+      "ip6": null,
+      "mac": "00:16:36:D2:EE:2C",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-79.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-79.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:EE:2D",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:D2:EE:2D",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:D2:F8:8D",
-      "ip": "192.168.24.79",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.79",
+      "ip6": null,
+      "mac": "00:16:36:D2:F8:8D",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-79-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-79-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-79"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json
index dcaeec43b0a..90c65805750 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-8",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:E0:78:B2",
-      "ip": "172.16.113.8",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.8",
+      "ip6": null,
+      "mac": "00:16:36:E0:78:B2",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-8.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-8.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:78:B3",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:E0:78:B3",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E0:8B:D2",
-      "ip": "192.168.24.8",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.8",
+      "ip6": null,
+      "mac": "00:16:36:E0:8B:D2",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-8-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-8-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json
index 7dcfd4b903f..fd1fc7a9a1e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-80",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:E7:77:6D",
-      "ip": "172.16.113.80",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.80",
+      "ip6": null,
+      "mac": "00:16:36:E7:77:6D",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-80.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-80.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E7:77:6E",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:E7:77:6E",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:E7:80:80",
-      "ip": "192.168.24.80",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.80",
+      "ip6": null,
+      "mac": "00:16:36:E7:80:80",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-80-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-80-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-80"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json
index 92698f8d434..39e97345ee7 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 232830643653.87
-    }
-  ],
-  "uid": "pastel-9",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": "amd-v"
+    "smt_size": 4
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:16:36:76:52:AB",
-      "ip": "172.16.113.9",
+      "device": "eth0",
+      "driver": "forcedeth",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "172.16.113.9",
+      "ip6": null,
+      "mac": "00:16:36:76:52:AB",
       "management": false,
-      "version": "MCP55 Pro",
-      "driver": "forcedeth",
       "mountable": true,
-      "switch": "r4",
-      "network_address": "pastel-9.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "pastel-9.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "NVIDIA"
+      "switch": "r4",
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:76:52:AC",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:16:36:76:52:AC",
       "management": false,
-      "version": "MCP55 Pro",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "NVIDIA"
+      "switch": null,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
-      "mac": "00:16:36:76:56:C5",
-      "ip": "192.168.24.9",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.24.9",
+      "ip6": null,
+      "mac": "00:16:36:76:56:C5",
       "management": true,
-      "version": "BCM5715c",
       "mountable": false,
-      "switch": "<unknown>",
-      "network_address": "pastel-9-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "pastel-9-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "Broadcom"
+      "switch": "<unknown>",
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2613000000,
+    "cache_l1i": null,
     "cache_l2": 1048576,
+    "clock_speed": 2613000000,
     "instruction_set": "",
-    "version": "2218",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "pastel-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/pastel.json b/data/grid5000/sites/toulouse/clusters/pastel/pastel.json
index e0294c6a998..4cd0a164b9d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/pastel.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/pastel.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
-  "uid": "pastel",
+  "created_at": "Wed, 28 Nov 2007 23:00:00 GMT",
   "model": "Sun Fire X2200 M2",
-  "created_at": "Wed, 28 Nov 2007 23:00:00 GMT"
+  "type": "cluster",
+  "uid": "pastel"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-1.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-1.json
index 8e7e0a260ef..8b93c341e6d 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-1.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-1.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-1",
-  "supported_job_types": {
-    "deploy": false,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:3E:A1",
-      "ip": "192.168.22.3",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.3",
+      "ip6": null,
+      "mac": "00:09:3D:10:3E:A1",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-1.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-1.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3E:A2",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:3E:A2",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3E:A3",
-      "ip": "192.168.23.3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.3",
+      "ip6": null,
+      "mac": "00:09:3D:10:3E:A3",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-1-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-1-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": false,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-10.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-10.json
index 6bf0ebbf16c..78053ac60f8 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-10.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-10.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-10",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:35:FB",
-      "ip": "192.168.22.12",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.12",
+      "ip6": null,
+      "mac": "00:09:3D:10:35:FB",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-10.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-10.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:35:FC",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:35:FC",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:35:FD",
-      "ip": "192.168.23.12",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.12",
+      "ip6": null,
+      "mac": "00:09:3D:10:35:FD",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-10-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-10-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-11.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-11.json
index 04dbdf9d511..e0a60929b2b 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-11.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-11.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-11",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:35:CB",
-      "ip": "192.168.22.13",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.13",
+      "ip6": null,
+      "mac": "00:09:3D:10:35:CB",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-11.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-11.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:35:CC",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:35:CC",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:35:CD",
-      "ip": "192.168.23.13",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.13",
+      "ip6": null,
+      "mac": "00:09:3D:10:35:CD",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-11-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-11-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-12.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-12.json
index b9877c2513f..58088e29c6c 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-12.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-12.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-12",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:3B:BE",
-      "ip": "192.168.22.14",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.14",
+      "ip6": null,
+      "mac": "00:09:3D:10:3B:BE",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-12.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-12.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3B:BF",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:3B:BF",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3B:C0",
-      "ip": "192.168.23.14",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.14",
+      "ip6": null,
+      "mac": "00:09:3D:10:3B:C0",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-12-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-12-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-13.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-13.json
index 36684f5bd15..630ec69bb1d 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-13.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-13.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-13",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:3B:8B",
-      "ip": "192.168.22.15",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.15",
+      "ip6": null,
+      "mac": "00:09:3D:10:3B:8B",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-13.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-13.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3B:8C",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:3B:8C",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3B:8D",
-      "ip": "192.168.23.15",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.15",
+      "ip6": null,
+      "mac": "00:09:3D:10:3B:8D",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-13-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-13-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-14.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-14.json
index 9d9cc19dd16..8a3d891288f 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-14.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-14.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-14",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:3E:01",
-      "ip": "192.168.22.16",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.16",
+      "ip6": null,
+      "mac": "00:09:3D:10:3E:01",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-14.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-14.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3E:02",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:3E:02",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3E:03",
-      "ip": "192.168.23.16",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.16",
+      "ip6": null,
+      "mac": "00:09:3D:10:3E:03",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-14-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-14-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-15.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-15.json
index 305751d98b2..9000daf1175 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-15.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-15.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-15",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:13:F6",
-      "ip": "192.168.22.17",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.17",
+      "ip6": null,
+      "mac": "00:09:3D:10:13:F6",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-15.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-15.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:13:F7",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:13:F7",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:13:F8",
-      "ip": "192.168.23.17",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.17",
+      "ip6": null,
+      "mac": "00:09:3D:10:13:F8",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-15-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-15-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-16.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-16.json
index 3ae00cef9f7..f6dda00dc2b 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-16.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-16.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-16",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:3E:DB",
-      "ip": "192.168.22.18",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.18",
+      "ip6": null,
+      "mac": "00:09:3D:10:3E:DB",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-16.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-16.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3E:DC",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:3E:DC",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3E:DD",
-      "ip": "192.168.23.18",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.18",
+      "ip6": null,
+      "mac": "00:09:3D:10:3E:DD",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-16-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-16-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-17.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-17.json
index cb8515d19fe..7c5313c3f3e 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-17.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-17.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-17",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:37:7B",
-      "ip": "192.168.22.19",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.19",
+      "ip6": null,
+      "mac": "00:09:3D:10:37:7B",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-17.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-17.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:37:7C",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:37:7C",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:37:7D",
-      "ip": "192.168.23.19",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.19",
+      "ip6": null,
+      "mac": "00:09:3D:10:37:7D",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-17-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-17-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-18.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-18.json
index 7972f9ba642..bda989014fa 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-18.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-18.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-18",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:B8:9F",
-      "ip": "192.168.22.20",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.20",
+      "ip6": null,
+      "mac": "00:09:3D:10:B8:9F",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-18.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-18.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:B8:A0",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:B8:A0",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:B8:A1",
-      "ip": "192.168.23.20",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.20",
+      "ip6": null,
+      "mac": "00:09:3D:10:B8:A1",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-18-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-18-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-19.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-19.json
index f8d9196cef3..068e00b908e 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-19.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-19.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-19",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:36:0D",
-      "ip": "192.168.22.21",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.21",
+      "ip6": null,
+      "mac": "00:09:3D:10:36:0D",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-19.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-19.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:36:0E",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:36:0E",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:36:0F",
-      "ip": "192.168.23.21",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.21",
+      "ip6": null,
+      "mac": "00:09:3D:10:36:0F",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-19-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-19-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-2.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-2.json
index 511d9414dda..30c34e56a69 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-2.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-2.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-2",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:3B:D0",
-      "ip": "192.168.22.4",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.4",
+      "ip6": null,
+      "mac": "00:09:3D:10:3B:D0",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-2.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-2.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3B:D1",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:3B:D1",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3B:D2",
-      "ip": "192.168.23.4",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.4",
+      "ip6": null,
+      "mac": "00:09:3D:10:3B:D2",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-2-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-2-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-20.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-20.json
index 545e15b1f44..e826a60e6d1 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-20.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-20.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-20",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:36:0A",
-      "ip": "192.168.22.22",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.22",
+      "ip6": null,
+      "mac": "00:09:3D:10:36:0A",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-20.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-20.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:36:0B",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:36:0B",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:36:0C",
-      "ip": "192.168.23.22",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.22",
+      "ip6": null,
+      "mac": "00:09:3D:10:36:0C",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-20-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-20-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-21.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-21.json
index fd60187c0c2..c8d804a77d5 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-21.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-21.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-21",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:34:A2",
-      "ip": "192.168.22.23",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.23",
+      "ip6": null,
+      "mac": "00:09:3D:10:34:A2",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-21.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-21.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:34:A3",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:34:A3",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:34:A4",
-      "ip": "192.168.23.23",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.23",
+      "ip6": null,
+      "mac": "00:09:3D:10:34:A4",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-21-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-21-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-22.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-22.json
index 19b71427743..d8c12cf9093 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-22.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-22.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-22",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:13:E7",
-      "ip": "192.168.22.24",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.24",
+      "ip6": null,
+      "mac": "00:09:3D:10:13:E7",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-22.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-22.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:13:E8",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:13:E8",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:13:E9",
-      "ip": "192.168.23.24",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.24",
+      "ip6": null,
+      "mac": "00:09:3D:10:13:E9",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-22-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-22-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-23.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-23.json
index 982d9ee1cc1..08f653863d4 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-23.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-23.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-23",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:3D:8C",
-      "ip": "192.168.22.25",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.25",
+      "ip6": null,
+      "mac": "00:09:3D:10:3D:8C",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-23.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-23.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3D:8D",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:3D:8D",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3D:8E",
-      "ip": "192.168.23.25",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.25",
+      "ip6": null,
+      "mac": "00:09:3D:10:3D:8E",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-23-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-23-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-24.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-24.json
index c56c92efda6..029928d1ba5 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-24.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-24.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-24",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:36:31",
-      "ip": "192.168.22.26",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.26",
+      "ip6": null,
+      "mac": "00:09:3D:10:36:31",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-24.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-24.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:36:32",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:36:32",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:36:33",
-      "ip": "192.168.23.26",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.26",
+      "ip6": null,
+      "mac": "00:09:3D:10:36:33",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-24-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-24-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-25.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-25.json
index 526fc54e1d0..9dac4e4498c 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-25.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-25.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-25",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:10:AF",
-      "ip": "192.168.22.27",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.27",
+      "ip6": null,
+      "mac": "00:09:3D:10:10:AF",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-25.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-25.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:10:B0",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:10:B0",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:10:B1",
-      "ip": "192.168.23.27",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.27",
+      "ip6": null,
+      "mac": "00:09:3D:10:10:B1",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-25-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-25-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-26.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-26.json
index 7b7b8720a2a..76d370aabb3 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-26.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-26.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-26",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:13:F9",
-      "ip": "192.168.22.28",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.28",
+      "ip6": null,
+      "mac": "00:09:3D:10:13:F9",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-26.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-26.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:13:FA",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:13:FA",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:13:FB",
-      "ip": "192.168.23.28",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.28",
+      "ip6": null,
+      "mac": "00:09:3D:10:13:FB",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-26-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-26-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-27.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-27.json
index 9515a8b901f..a0393298a2a 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-27.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-27.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-27",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:12:F1",
-      "ip": "192.168.22.29",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.29",
+      "ip6": null,
+      "mac": "00:09:3D:10:12:F1",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-27.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-27.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:12:F2",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:12:F2",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:12:F3",
-      "ip": "192.168.23.29",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.29",
+      "ip6": null,
+      "mac": "00:09:3D:10:12:F3",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-27-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-27-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-28.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-28.json
index c90b50196c4..541ec0f9308 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-28.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-28.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-28",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:13:C6",
-      "ip": "192.168.22.30",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.30",
+      "ip6": null,
+      "mac": "00:09:3D:10:13:C6",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-28.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-28.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:13:C7",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:13:C7",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:13:CB",
-      "ip": "192.168.23.30",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.30",
+      "ip6": null,
+      "mac": "00:09:3D:10:13:CB",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-28-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-28-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-29.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-29.json
index dad40d57894..d6234a0b2bb 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-29.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-29.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-29",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:14:CE",
-      "ip": "192.168.22.31",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.31",
+      "ip6": null,
+      "mac": "00:09:3D:10:14:CE",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-29.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-29.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:14:CF",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:14:CF",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:14:0D",
-      "ip": "192.168.23.31",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.31",
+      "ip6": null,
+      "mac": "00:09:3D:10:14:0D",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-29-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-29-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-3.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-3.json
index 27d851fe4a1..fd0119488aa 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-3.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-3.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-3",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:3D:AD",
-      "ip": "192.168.22.5",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.5",
+      "ip6": null,
+      "mac": "00:09:3D:10:3D:AD",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-3.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-3.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3D:AE",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:3D:AE",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3D:AF",
-      "ip": "192.168.23.5",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.5",
+      "ip6": null,
+      "mac": "00:09:3D:10:3D:AF",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-3-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-3-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-30.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-30.json
index d67586f19c2..ff46b4c0b4a 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-30.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-30.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-30",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:14:8F",
-      "ip": "192.168.22.32",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.32",
+      "ip6": null,
+      "mac": "00:09:3D:10:14:8F",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-30.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-30.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:14:90",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:14:90",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:14:91",
-      "ip": "192.168.23.32",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.32",
+      "ip6": null,
+      "mac": "00:09:3D:10:14:91",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-30-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-30-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-31.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-31.json
index a2873b45fd8..7fd108e2324 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-31.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-31.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-31",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:3B:37",
-      "ip": "192.168.22.33",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.33",
+      "ip6": null,
+      "mac": "00:09:3D:10:3B:37",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-31.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-31.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3B:38",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:3B:38",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3B:39",
-      "ip": "192.168.23.33",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.33",
+      "ip6": null,
+      "mac": "00:09:3D:10:3B:39",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-31-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-31-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-32.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-32.json
index 9a377fc903e..f4a4be6ad2b 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-32.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-32.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-32",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:7F:F2",
-      "ip": "192.168.22.34",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.34",
+      "ip6": null,
+      "mac": "00:09:3D:12:7F:F2",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-32.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-32.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:7F:F7",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:7F:F7",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:7F:F8",
-      "ip": "192.168.23.34",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.34",
+      "ip6": null,
+      "mac": "00:09:3D:12:7F:F8",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-32-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-32-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-33.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-33.json
index 6bf10805c0c..84865bb61eb 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-33.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-33.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-33",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:45:0E",
-      "ip": "192.168.22.35",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.35",
+      "ip6": null,
+      "mac": "00:09:3D:12:45:0E",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-33.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-33.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:45:0F",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:45:0F",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:45:10",
-      "ip": "192.168.23.35",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.35",
+      "ip6": null,
+      "mac": "00:09:3D:12:45:10",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-33-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-33-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-34.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-34.json
index b7d64752788..a01f46c137d 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-34.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-34.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-34",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:66:16",
-      "ip": "192.168.22.36",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.36",
+      "ip6": null,
+      "mac": "00:09:3D:12:66:16",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-34.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-34.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:66:17",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:66:17",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:66:18",
-      "ip": "192.168.23.36",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.36",
+      "ip6": null,
+      "mac": "00:09:3D:12:66:18",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-34-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-34-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-35.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-35.json
index 980a4e423ef..c91403e2f05 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-35.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-35.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-35",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:6C:F3",
-      "ip": "192.168.22.37",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.37",
+      "ip6": null,
+      "mac": "00:09:3D:12:6C:F3",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-35.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-35.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:6C:F4",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:6C:F4",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:6C:F5",
-      "ip": "192.168.23.37",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.37",
+      "ip6": null,
+      "mac": "00:09:3D:12:6C:F5",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-35-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-35-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-36.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-36.json
index df49fd1ff42..22ad36da987 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-36.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-36.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-36",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:D4:DB",
-      "ip": "192.168.22.38",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.38",
+      "ip6": null,
+      "mac": "00:09:3D:12:D4:DB",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-36.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-36.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:D4:DC",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:D4:DC",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:D4:DD",
-      "ip": "192.168.23.38",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.38",
+      "ip6": null,
+      "mac": "00:09:3D:12:D4:DD",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-36-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-36-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-37.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-37.json
index 504c61e7ac1..f1e08032790 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-37.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-37.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-37",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:9F:78",
-      "ip": "192.168.22.39",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.39",
+      "ip6": null,
+      "mac": "00:09:3D:12:9F:78",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-37.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-37.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:9F:79",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:9F:79",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:9F:7A",
-      "ip": "192.168.23.39",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.39",
+      "ip6": null,
+      "mac": "00:09:3D:12:9F:7A",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-37-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-37-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-38.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-38.json
index aa691cd08ba..ca245b7046c 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-38.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-38.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-38",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:3F:12",
-      "ip": "192.168.22.40",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.40",
+      "ip6": null,
+      "mac": "00:09:3D:12:3F:12",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-38.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-38.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:3F:13",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:3F:13",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:3F:14",
-      "ip": "192.168.23.40",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.40",
+      "ip6": null,
+      "mac": "00:09:3D:12:3F:14",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-38-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-38-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-39.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-39.json
index 65592197fc4..d5bade22a31 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-39.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-39.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-39",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:3F:D5",
-      "ip": "192.168.22.41",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.41",
+      "ip6": null,
+      "mac": "00:09:3D:12:3F:D5",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-39.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-39.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:3F:D6",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:3F:D6",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:3F:D7",
-      "ip": "192.168.23.41",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.41",
+      "ip6": null,
+      "mac": "00:09:3D:12:3F:D7",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-39-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-39-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-4.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-4.json
index 15282107859..bf9e00fe75b 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-4.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-4.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-4",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:38:6E",
-      "ip": "192.168.22.6",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.6",
+      "ip6": null,
+      "mac": "00:09:3D:10:38:6E",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-4.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-4.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:38:6F",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:38:6F",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:38:70",
-      "ip": "192.168.23.6",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.6",
+      "ip6": null,
+      "mac": "00:09:3D:10:38:70",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-4-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-4-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-40.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-40.json
index 6be561819a1..5268306217d 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-40.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-40.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-40",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:3F:39",
-      "ip": "192.168.22.42",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.42",
+      "ip6": null,
+      "mac": "00:09:3D:12:3F:39",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-40.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-40.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:3F:3A",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:3F:3A",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:3F:3B",
-      "ip": "192.168.23.42",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.42",
+      "ip6": null,
+      "mac": "00:09:3D:12:3F:3B",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-40-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-40-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-41.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-41.json
index a3a1324c0ca..022f279cff6 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-41.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-41.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-41",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:3D:CC",
-      "ip": "192.168.22.43",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.43",
+      "ip6": null,
+      "mac": "00:09:3D:12:3D:CC",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-41.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-41.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:3D:CD",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:3D:CD",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:3D:CE",
-      "ip": "192.168.23.43",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.43",
+      "ip6": null,
+      "mac": "00:09:3D:12:3D:CE",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-41-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-41-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-42.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-42.json
index f2cb961e122..c2a460fb7fe 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-42.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-42.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-42",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:77:4B",
-      "ip": "192.168.22.44",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.44",
+      "ip6": null,
+      "mac": "00:09:3D:12:77:4B",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-42.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-42.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:77:4C",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:77:4C",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:77:4D",
-      "ip": "192.168.23.44",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.44",
+      "ip6": null,
+      "mac": "00:09:3D:12:77:4D",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-42-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-42-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-43.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-43.json
index 76a201fc456..fec0f6ce43e 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-43.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-43.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-43",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:DC:2C",
-      "ip": "192.168.22.45",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.45",
+      "ip6": null,
+      "mac": "00:09:3D:12:DC:2C",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-43.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-43.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:DC:2D",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:DC:2D",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:DC:2E",
-      "ip": "192.168.23.45",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.45",
+      "ip6": null,
+      "mac": "00:09:3D:12:DC:2E",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-43-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-43-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-44.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-44.json
index 20c38b872fb..5f923f0da57 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-44.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-44.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-44",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:68:4F",
-      "ip": "192.168.22.46",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.46",
+      "ip6": null,
+      "mac": "00:09:3D:12:68:4F",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-44.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-44.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:68:50",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:68:50",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:68:51",
-      "ip": "192.168.23.46",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.46",
+      "ip6": null,
+      "mac": "00:09:3D:12:68:51",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-44-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-44-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-45.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-45.json
index 25b0613eae3..ec3224f1926 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-45.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-45.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-45",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:6A:75",
-      "ip": "192.168.22.47",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.47",
+      "ip6": null,
+      "mac": "00:09:3D:12:6A:75",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-45.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-45.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:6A:76",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:6A:76",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:6A:77",
-      "ip": "192.168.23.47",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.47",
+      "ip6": null,
+      "mac": "00:09:3D:12:6A:77",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-45-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-45-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-46.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-46.json
index bd88efcb3f8..a597eb6dc59 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-46.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-46.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-46",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:2D:79",
-      "ip": "192.168.22.48",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.48",
+      "ip6": null,
+      "mac": "00:09:3D:12:2D:79",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-46.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-46.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:2D:7A",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:2D:7A",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:2D:7B",
-      "ip": "192.168.23.48",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.48",
+      "ip6": null,
+      "mac": "00:09:3D:12:2D:7B",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-46-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-46-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-47.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-47.json
index 7a685f1f347..1285d94f3b5 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-47.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-47.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-47",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:3F:69",
-      "ip": "192.168.22.49",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.49",
+      "ip6": null,
+      "mac": "00:09:3D:12:3F:69",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-47.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-47.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:3F:6A",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:3F:6A",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:3F:6B",
-      "ip": "192.168.23.49",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.49",
+      "ip6": null,
+      "mac": "00:09:3D:12:3F:6B",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-47-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-47-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-48.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-48.json
index 4f1c7ee309e..9477a0be367 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-48.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-48.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-48",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:66:73",
-      "ip": "192.168.22.50",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.50",
+      "ip6": null,
+      "mac": "00:09:3D:12:66:73",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-48.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-48.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:66:74",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:66:74",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:66:75",
-      "ip": "192.168.23.50",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.50",
+      "ip6": null,
+      "mac": "00:09:3D:12:66:75",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-48-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-48-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-49.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-49.json
index bb61c1b5a51..1482de35182 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-49.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-49.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-49",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:8D:D5",
-      "ip": "192.168.22.51",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.51",
+      "ip6": null,
+      "mac": "00:09:3D:12:8D:D5",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-49.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-49.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:8D:D6",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:8D:D6",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:8D:D7",
-      "ip": "192.168.23.51",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.51",
+      "ip6": null,
+      "mac": "00:09:3D:12:8D:D7",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-49-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-49-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-5.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-5.json
index 4cc5144ebb0..9e652ad26de 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-5.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-5.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-5",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:39:82",
-      "ip": "192.168.22.7",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.7",
+      "ip6": null,
+      "mac": "00:09:3D:10:39:82",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-5.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-5.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:39:83",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:39:83",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:39:84",
-      "ip": "192.168.23.7",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.7",
+      "ip6": null,
+      "mac": "00:09:3D:10:39:84",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-5-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-5-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-50.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-50.json
index 971cce37d6f..a7526a1ab47 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-50.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-50.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-50",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:DC:54",
-      "ip": "192.168.22.52",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.52",
+      "ip6": null,
+      "mac": "00:09:3D:12:DC:54",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-50.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-50.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:DC:55",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:DC:55",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:DC:56",
-      "ip": "192.168.23.52",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.52",
+      "ip6": null,
+      "mac": "00:09:3D:12:DC:56",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-50-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-50-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-51.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-51.json
index 4f612b334af..01f9f57fed9 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-51.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-51.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-51",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:82:3D",
-      "ip": "192.168.22.53",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.53",
+      "ip6": null,
+      "mac": "00:09:3D:12:82:3D",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-51.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-51.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:82:3E",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:82:3E",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:82:3F",
-      "ip": "192.168.23.53",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.53",
+      "ip6": null,
+      "mac": "00:09:3D:12:82:3F",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-51-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-51-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-52.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-52.json
index 1760549feff..bd1c8bc6fa3 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-52.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-52.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-52",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:12:80:91",
-      "ip": "192.168.22.54",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.54",
+      "ip6": null,
+      "mac": "00:09:3D:12:80:91",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-52.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-52.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:80:92",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:12:80:92",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:12:80:93",
-      "ip": "192.168.23.54",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.54",
+      "ip6": null,
+      "mac": "00:09:3D:12:80:93",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-52-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-52-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-6.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-6.json
index f422118470e..11b4f9fb53b 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-6.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-6.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-6",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:2D:E1",
-      "ip": "192.168.22.8",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.8",
+      "ip6": null,
+      "mac": "00:09:3D:10:2D:E1",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-6.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-6.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:2D:E2",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:2D:E2",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:2D:E3",
-      "ip": "192.168.23.8",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.8",
+      "ip6": null,
+      "mac": "00:09:3D:10:2D:E3",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-6-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-6-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-7.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-7.json
index 4b56ee0a7b4..5cbcad7ca3a 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-7.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-7.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-7",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:3E:3A",
-      "ip": "192.168.22.9",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.9",
+      "ip6": null,
+      "mac": "00:09:3D:10:3E:3A",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-7.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-7.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3E:3B",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:3E:3B",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3E:3C",
-      "ip": "192.168.23.9",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.9",
+      "ip6": null,
+      "mac": "00:09:3D:10:3E:3C",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-7-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-7-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-8.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-8.json
index 9afd8fad01f..c294a593b7b 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-8.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-8.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-8",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:2F:55",
-      "ip": "192.168.22.10",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.10",
+      "ip6": null,
+      "mac": "00:09:3D:10:2F:55",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-8.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-8.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:2F:56",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:2F:56",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:2F:57",
-      "ip": "192.168.23.10",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.10",
+      "ip6": null,
+      "mac": "00:09:3D:10:2F:57",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-8-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-8-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-9.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-9.json
index dfd72d63958..1598b73ffde 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-9.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-9.json
@@ -1,22 +1,8 @@
 {
-  "type": "node",
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
-  },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
-  "uid": "violette-9",
-  "supported_job_types": {
-    "deploy": true,
-    "besteffort": true,
-    "virtual": false
+    "smt_size": 2
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -24,66 +10,80 @@
   },
   "network_adapters": [
     {
-      "mac": "00:09:3D:10:3E:07",
-      "ip": "192.168.22.11",
+      "device": "eth0",
+      "driver": "tg3",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.22.11",
+      "ip6": null,
+      "mac": "00:09:3D:10:3E:07",
       "management": false,
-      "version": "BCM5703X",
-      "driver": "tg3",
       "mountable": true,
-      "switch": "cict-switch",
-      "network_address": "violette-9.toulouse.grid5000.fr",
       "mounted": true,
+      "network_address": "violette-9.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "device": "eth0",
-      "vendor": "Broadcom"
+      "switch": "cict-switch",
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3E:08",
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:09:3D:10:3E:08",
       "management": false,
-      "version": "BCM5703X",
       "mountable": false,
-      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "device": "eth1",
-      "vendor": "Broadcom"
+      "switch": null,
+      "vendor": "Broadcom",
+      "version": "BCM5703X"
     },
     {
-      "mac": "00:09:3D:10:3E:09",
-      "ip": "192.168.23.11",
       "enabled": true,
-      "ip6": null,
       "interface": "Ethernet",
+      "ip": "192.168.23.11",
+      "ip6": null,
+      "mac": "00:09:3D:10:3E:09",
       "management": true,
-      "version": "?",
       "mountable": false,
-      "switch": "cict-switch",
-      "network_address": "violette-9-bmc.toulouse.grid5000.fr",
       "mounted": false,
+      "network_address": "violette-9-bmc.toulouse.grid5000.fr",
       "rate": 1000000000,
-      "vendor": "?"
+      "switch": "cict-switch",
+      "vendor": "?",
+      "version": "?"
     }
   ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
   "processor": {
+    "cache_l1": null,
     "cache_l1d": null,
-    "clock_speed": 2190000000,
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2190000000,
     "instruction_set": "",
-    "version": "248",
-    "other_description": "",
-    "cache_l1": null,
     "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD"
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
   },
-  "operating_system": {
-    "version": null,
-    "name": null,
-    "release": null
-  }
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "violette-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/violette.json b/data/grid5000/sites/toulouse/clusters/violette/violette.json
index 8959951def8..ec1b67f2f6a 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/violette.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/violette.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
-  "uid": "violette",
+  "created_at": "Tue, 31 Aug 2004 22:00:00 GMT",
   "model": "Sun Fire V20z",
-  "created_at": "Tue, 31 Aug 2004 22:00:00 GMT"
+  "type": "cluster",
+  "uid": "violette"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/toulouse.json b/data/grid5000/sites/toulouse/toulouse.json
index 5b652437d84..ed1882a1621 100755
--- a/data/grid5000/sites/toulouse/toulouse.json
+++ b/data/grid5000/sites/toulouse/toulouse.json
@@ -1,14 +1,14 @@
 {
-  "type": "site",
-  "user_support_contact": null,
+  "description": "",
+  "email_contact": null,
   "latitude": 43.6167,
-  "uid": "toulouse",
+  "location": "Toulouse, France",
   "longitude": 1.4333,
-  "email_contact": null,
-  "sys_admin_contact": null,
   "name": "Toulouse",
-  "location": "Toulouse, France",
-  "description": "",
   "security_contact": null,
+  "sys_admin_contact": null,
+  "type": "site",
+  "uid": "toulouse",
+  "user_support_contact": null,
   "web": null
 }
\ No newline at end of file
-- 
GitLab