From 0c24308c68b918dffa6480b8e205445a4450f435 Mon Sep 17 00:00:00 2001
From: Gaetan Simo <gaetan.simo@inria.fr>
Date: Sat, 29 Jan 2011 15:44:42 +0100
Subject: [PATCH] [Environments] Added Environment lenny-x64-base version 5 to
 the API (only on rennes and toulouse)

---
 .../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 +-
 .../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 +-
 302 files changed, 14845 insertions(+), 14845 deletions(-)

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 17d1604d022..e46cffd59b4 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.101",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.101",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-1.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-1"
+  "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"
+  }
 }
\ 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 886aa26b729..0025709410e 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.110",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.110",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-10.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-10"
+  "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"
+  }
 }
\ 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 da7f10ff485..f651af3498e 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.111",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.111",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-11.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-11"
+  "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"
+  }
 }
\ 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 33328a4153c..c20fad350d7 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.112",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.112",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-12.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-12"
+  "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"
+  }
 }
\ 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 cefb9fb2045..ef054f6df73 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.113",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.113",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-13.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-13"
+  "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"
+  }
 }
\ 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 1acb344dcb5..70e36080449 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.114",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.114",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-14.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-14"
+  "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"
+  }
 }
\ 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 f8a671af6c2..53253b2198d 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.115",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.115",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-15.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-15"
+  "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"
+  }
 }
\ 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 5542bc4f3b0..371432a1669 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.116",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.116",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-16.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-16"
+  "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"
+  }
 }
\ 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 37db9ca04f5..72de24e22d9 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.117",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.117",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-17.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-17"
+  "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"
+  }
 }
\ 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 5cb34e47e8d..280fedbc5c4 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.118",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.118",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-18.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-18"
+  "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"
+  }
 }
\ 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 1a8efc1e7c4..437aecaf8db 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.119",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.119",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-19.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-19"
+  "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"
+  }
 }
\ 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 5e1da0b83a4..9734ee28c12 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.102",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.102",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-2.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-2"
+  "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"
+  }
 }
\ 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 1ce1f9aa8f7..be92db48839 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.120",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.120",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-20.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-20"
+  "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"
+  }
 }
\ 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 11b7a504e8e..970e94345ba 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.121",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.121",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-21.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-21"
+  "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"
+  }
 }
\ 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 208e28d143a..0c2f7445b8e 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.122",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.122",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-22.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-22"
+  "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"
+  }
 }
\ 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 5dff7083cc4..b9803718aa8 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.123",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.123",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-23.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-23"
+  "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"
+  }
 }
\ 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 c9a0d26b5b2..925ba6f3508 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.124",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.124",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-24.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-24"
+  "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"
+  }
 }
\ 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 8170fd2084f..31e8548193d 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.125",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.125",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-25.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-25"
+  "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"
+  }
 }
\ 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 4009a8e2eff..22989d3aba5 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.126",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.126",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-26.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-26"
+  "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"
+  }
 }
\ 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 8910d67eb12..0e61fb61fe9 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.127",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.127",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-27.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-27"
+  "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"
+  }
 }
\ 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 e0917642866..592a20f1972 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.128",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.128",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-28.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-28"
+  "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"
+  }
 }
\ 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 f97666d5fb9..c1a0d53ee66 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.129",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.129",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-29.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-29"
+  "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"
+  }
 }
\ 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 2f982af82a6..a3b25f6345f 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.103",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.103",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-3.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-3"
+  "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"
+  }
 }
\ 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 30f02d9a2e0..39ef1284d9c 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.130",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.130",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-30.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-30"
+  "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"
+  }
 }
\ 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 ae9044e4d79..19f4bcbf421 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.131",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.131",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-31.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-31"
+  "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"
+  }
 }
\ 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 4a054bad243..c508d6522ff 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.132",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.132",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-32.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-32"
+  "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"
+  }
 }
\ 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 4c4b38e272d..65cb8282e67 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.133",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.133",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-33.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-33"
+  "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"
+  }
 }
\ 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 d73e7112372..be8be5b970f 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.134",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.134",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-34.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-34"
+  "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"
+  }
 }
\ 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 77a46b2ffb7..683ecfff865 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.135",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.135",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-35.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-35"
+  "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"
+  }
 }
\ 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 27f12840ad3..3722c26e01c 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.136",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.136",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-36.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-36"
+  "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"
+  }
 }
\ 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 cb1565e63c5..54063f9e6c2 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.137",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.137",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-37.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-37"
+  "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"
+  }
 }
\ 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 f65749d27c1..5245ce8be24 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.138",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.138",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-38.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-38"
+  "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"
+  }
 }
\ 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 3da20595adc..54fd8a89d4d 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.139",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.139",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-39.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-39"
+  "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"
+  }
 }
\ 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 5f462d9c5ab..4452e5dcce3 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.104",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.104",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-4.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-4"
+  "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"
+  }
 }
\ 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 60f669ff43a..efb811fe3e7 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.140",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.140",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-40.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-40"
+  "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"
+  }
 }
\ 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 c58286394aa..4c43ebb9a9f 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.141",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.141",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-41.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-41"
+  "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"
+  }
 }
\ 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 f68dbae7ec3..2bc4f8cf1ed 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.142",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.142",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-42.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-42"
+  "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"
+  }
 }
\ 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 4801bdc274f..dbf539c7d42 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.143",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.143",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-43.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-43"
+  "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"
+  }
 }
\ 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 42ef8e0474a..7f679db402a 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.144",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.144",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-44.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-44"
+  "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"
+  }
 }
\ 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 4d05f686933..d6ebad66857 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.145",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.145",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-45.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-45"
+  "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"
+  }
 }
\ 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 8447c4b9d57..b758bdd9280 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.146",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.146",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-46.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-46"
+  "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"
+  }
 }
\ 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 60a000571e5..ab5f04e54e0 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.147",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.147",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-47.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-47"
+  "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"
+  }
 }
\ 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 07bb0643714..d1d80afa86c 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.148",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.148",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-48.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-48"
+  "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"
+  }
 }
\ 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 2b0e177407f..9897823b799 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.149",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.149",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-49.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-49"
+  "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"
+  }
 }
\ 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 f50d1bd97ef..8b8321c7986 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.105",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.105",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-5.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-5"
+  "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"
+  }
 }
\ 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 9121a7f719c..72717085530 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.150",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.150",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-50.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-50"
+  "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"
+  }
 }
\ 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 e78ad8f6204..b30b89273ff 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.151",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.151",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-51.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-51"
+  "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"
+  }
 }
\ 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 cea2a41ce25..e6aee4e6ea4 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.152",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.152",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-52.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-52"
+  "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"
+  }
 }
\ 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 ca374afcc32..37c090fa819 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.153",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.153",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-53.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-53"
+  "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"
+  }
 }
\ 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 3de170ae6ce..555a48c7872 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.154",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.154",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-54.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-54"
+  "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"
+  }
 }
\ 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 2f1848c2009..dd94729ad37 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.155",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.155",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-55.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-55"
+  "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"
+  }
 }
\ 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 73716e3a582..ac51a9c9a75 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.156",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.156",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-56.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-56"
+  "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"
+  }
 }
\ 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 ec7fb51716c..318c531f816 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.157",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.157",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-57.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-57"
+  "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"
+  }
 }
\ 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 e641c4ce198..9501880c040 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.158",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.158",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-58.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-58"
+  "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"
+  }
 }
\ 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 34bd88e20dd..99ff8ca2551 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.159",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.159",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-59.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-59"
+  "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"
+  }
 }
\ 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 8d84e83e7ab..0583d0d2a78 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.106",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.106",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-6.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-6"
+  "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"
+  }
 }
\ 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 ce5d24a111d..8f5ee9f377e 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.160",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.160",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-60.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-60"
+  "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"
+  }
 }
\ 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 3e1182f615e..8b59da5d609 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.161",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.161",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-61.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-61"
+  "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"
+  }
 }
\ 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 fdb6e2a2d07..e576b916d1d 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.162",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.162",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-62.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-62"
+  "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"
+  }
 }
\ 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 cee0140168d..3ed02e34be9 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.163",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.163",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-63.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-63"
+  "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"
+  }
 }
\ 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 77e498a085c..96c9da38cb2 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.164",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.164",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-64.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-64"
+  "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"
+  }
 }
\ 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 25f4554594b..0d83d97e11f 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.107",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.107",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-7.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-7"
+  "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"
+  }
 }
\ 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 fc5827566b7..30fa2e2f044 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.108",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.108",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-8.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-8"
+  "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"
+  }
 }
\ 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 045e4da476f..df2f109f375 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
-  },
-  "main_memory": {
-    "ram_size": 34359738368,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "e1000e",
+      "rate": 1000000000,
+      "ip": "131.254.202.109",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.109",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paradent-9.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "management": false,
+      "driver": "e1000e",
+      "mountable": true
     },
     {
       "device": "eth1",
-      "driver": "e1000e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "driver": "e1000e"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ata_piix",
+      "size": 149011611938.477,
       "interface": "SATA",
-      "size": 149011611938.477
+      "driver": "ata_piix"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 34359738368,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paradent-9"
+  "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"
+  }
 }
\ 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 f3124659462..a5642117a59 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/paradent.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/paradent.json
@@ -1,6 +1,6 @@
 {
-  "created_at": "Sat, 31 Jan 2009 23:00:00 GMT",
-  "model": "Carry System",
   "type": "cluster",
-  "uid": "paradent"
+  "created_at": "Sat, 31 Jan 2009 23:00:00 GMT",
+  "uid": "paradent",
+  "model": "Carry System"
 }
\ 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 1ee1ef23cdd..d9269ea9452 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.171",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.171",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-1.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.171",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.171",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-1-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-1"
+  "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"
+  }
 }
\ 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 b4e69352c2b..1e62bd50013 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.180",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.180",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-10.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.180",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.180",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-10-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-10"
+  "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"
+  }
 }
\ 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 84ab13d69be..79990ffbb79 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.181",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.181",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-11.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.181",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.181",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-11-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-11"
+  "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"
+  }
 }
\ 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 bf1520d8df0..32e7afd15a8 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.182",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.182",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-12.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.182",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.182",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-12-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-12"
+  "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"
+  }
 }
\ 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 e49c8cad3eb..3bef693d573 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.183",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.183",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-13.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.183",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.183",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-13-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-13"
+  "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"
+  }
 }
\ 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 7d3f6dbf419..9a9bf4120c7 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.184",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.184",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-14.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.184",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.184",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-14-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-14"
+  "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"
+  }
 }
\ 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 f2b9a7c6914..50668bca7ac 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.185",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.185",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-15.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.185",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.185",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-15-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-15"
+  "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"
+  }
 }
\ 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 9af1266e497..0171ca1b117 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.186",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.186",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-16.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.186",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.186",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-16-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-16"
+  "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"
+  }
 }
\ 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 dc21d1cd87f..adaa1b8d457 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.187",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.187",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-17.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.187",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.187",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-17-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-17"
+  "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"
+  }
 }
\ 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 2b5a242313c..646e9e7d0da 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.188",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.188",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-18.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.188",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.188",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-18-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-18"
+  "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"
+  }
 }
\ 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 d5be9f0a6f7..3fff21c13c8 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.189",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.189",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-19.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.189",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.189",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-19-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-19"
+  "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"
+  }
 }
\ 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 52da6762490..858c7f708bd 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.172",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.172",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-2.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.172",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.172",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-2-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-2"
+  "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"
+  }
 }
\ 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 0340f0bb5b1..3ba466d768d 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.190",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.190",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-20.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.190",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.190",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-20-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-20"
+  "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"
+  }
 }
\ 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 b393457f129..c6ea44d6b88 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.191",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.191",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-21.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.191",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.191",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-21-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-21"
+  "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"
+  }
 }
\ 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 dd90eca3b29..a9ae38df767 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.192",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.192",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-22.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.192",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.192",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-22-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-22"
+  "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"
+  }
 }
\ 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 fdddfac00e2..3528582de2f 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.193",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.193",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-23.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.193",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.193",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-23-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-23"
+  "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"
+  }
 }
\ 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 c0732b8bc48..58a4d66b23b 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.194",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.194",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-24.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.194",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.194",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-24-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-24"
+  "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"
+  }
 }
\ 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 cffd0283c19..3920f9c2196 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.195",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.195",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-25.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.195",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.195",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-25-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-25"
+  "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"
+  }
 }
\ 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 5995f542563..a0ea19a8471 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.196",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.196",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-26.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.196",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.196",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-26-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-26"
+  "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"
+  }
 }
\ 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 6b6b5625e91..c913cd9c950 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.197",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.197",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-27.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.197",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.197",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-27-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-27"
+  "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"
+  }
 }
\ 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 183fc3e10aa..c22ffbb06c0 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.198",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.198",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-28.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.198",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.198",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-28-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-28"
+  "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"
+  }
 }
\ 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 f77c7353c77..e3d598300b5 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.199",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.199",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-29.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.199",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.199",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-29-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-29"
+  "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"
+  }
 }
\ 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 edfb98d9549..07f1ad86b9b 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.173",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.173",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-3.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.173",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.173",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-3-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-3"
+  "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"
+  }
 }
\ 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 c74bb4db6c7..8984ffe30e8 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.200",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.200",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-30.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.200",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.200",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-30-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-30"
+  "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"
+  }
 }
\ 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 a77f721662b..d139c892014 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.201",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.201",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-31.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.201",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.201",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-31-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-31"
+  "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"
+  }
 }
\ 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 17bb1cb6336..1a6cfcf5b67 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.202",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.202",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-32.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.202",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.202",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-32-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-32"
+  "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"
+  }
 }
\ 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 40fed283bb3..b9c33a225a4 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.203",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.203",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-33.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.203",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.203",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-33-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-33"
+  "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"
+  }
 }
\ 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 18fb3d8344c..7bd1570c468 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.174",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.174",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-4.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.174",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.174",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-4-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-4"
+  "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"
+  }
 }
\ 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 6083cf5eb53..47a31a3a31e 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.175",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.175",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-5.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.175",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.175",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-5-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-5"
+  "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"
+  }
 }
\ 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 95501d28e68..933d3e47f47 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.176",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.176",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-6.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.176",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.176",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-6-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-6"
+  "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"
+  }
 }
\ 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 f50a2d07142..7a648026b3a 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.177",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.177",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-7.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.177",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.177",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-7-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-7"
+  "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"
+  }
 }
\ 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 7b5885b1dce..b6701938d72 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.178",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.178",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-8.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.178",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.178",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-8-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-8"
+  "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"
+  }
 }
\ 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 48f2fd39959..f57b1bd198f 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
-  },
-  "main_memory": {
-    "ram_size": 8589934592,
-    "virtual_size": null
+    "smt_size": 4,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "vendor": "Broadcom",
+      "mounted": true,
       "device": "eth0",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
+      "ip": "131.254.202.179",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.179",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-9.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid",
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "management": false,
+      "driver": "bnx2",
+      "mountable": true
     },
     {
+      "vendor": "Broadcom",
       "device": "eth1",
-      "driver": "bnx2",
+      "version": "NetXtreme II BCM5708",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
+      "driver": "bnx2"
     },
     {
+      "vendor": "Myrinet",
+      "mounted": true,
       "device": "myri0",
+      "version": "10G-PCIE-8A-C",
+      "rate": 10000000000,
+      "ip": "192.168.200.179",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "192.168.200.179",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
       "network_address": "paramount-9-myri0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
+      "management": false,
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "megaraid_sas",
-      "interface": "SATA",
       "raid": "0",
-      "size": 558793544769.287
+      "size": 558793544769.287,
+      "interface": "SATA",
+      "driver": "megaraid_sas"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paramount-9"
+  "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"
+  }
 }
\ 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 3cbc5c2e21f..959bf6b2ce9 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/paramount.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/paramount.json
@@ -1,6 +1,6 @@
 {
-  "created_at": "Fri, 31 Aug 2007 22:00:00 GMT",
-  "model": "Dell PowerEdge 1950",
   "type": "cluster",
-  "uid": "paramount"
+  "created_at": "Fri, 31 Aug 2007 22:00:00 GMT",
+  "uid": "paramount",
+  "model": "Dell PowerEdge 1950"
 }
\ 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 674f4e32cf7..0dc88c78b8a 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.221",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.221",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-1.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.221",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.221",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-1-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-1"
+  "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"
+  }
 }
\ 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 1dd0e0edee6..58b163da2bc 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.230",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.230",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-10.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.230",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.230",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-10-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-10"
+  "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"
+  }
 }
\ 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 eea24086479..1409dc13829 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.231",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.231",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-11.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.231",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.231",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-11-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-11"
+  "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"
+  }
 }
\ 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 045f2e87f93..8bb3a7fd82d 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.232",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.232",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-12.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.232",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.232",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-12-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-12"
+  "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"
+  }
 }
\ 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 f7d2e18f45c..855c30a7ef3 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.233",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.233",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-13.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.233",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.233",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-13-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-13"
+  "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"
+  }
 }
\ 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 c7ffa51df28..2416b15c4ed 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.234",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.234",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-14.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.234",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.234",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-14-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-14"
+  "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"
+  }
 }
\ 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 99ec8730965..156a7c45e44 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.235",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.235",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-15.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.235",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.235",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-15-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-15"
+  "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"
+  }
 }
\ 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 a1d469e096a..c135007e594 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.236",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.236",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-16.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.236",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.236",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-16-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-16"
+  "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"
+  }
 }
\ 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 a62eac2ef6a..3c263f0329e 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.237",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.237",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-17.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.237",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.237",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-17-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-17"
+  "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"
+  }
 }
\ 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 d8fb27fa4b3..a15a1cb6d1f 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.238",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.238",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-18.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.238",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.238",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-18-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-18"
+  "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"
+  }
 }
\ 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 d30364a897f..8dc6ebc6e4c 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.239",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.239",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-19.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.239",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.239",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-19-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-19"
+  "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"
+  }
 }
\ 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 b42fb7c15f9..e2663bdee24 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.222",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.222",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-2.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.222",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.222",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-2-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-2"
+  "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"
+  }
 }
\ 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 701afecdb69..3f4f43fc11d 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.240",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.240",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-20.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.240",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.240",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-20-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-20"
+  "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"
+  }
 }
\ 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 60131260997..5d0c82bb8c2 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.241",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.241",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-21.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.241",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.241",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-21-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-21"
+  "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"
+  }
 }
\ 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 f07fd8faba3..62b66dab46e 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.242",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.242",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-22.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.242",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.242",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-22-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-22"
+  "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"
+  }
 }
\ 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 0a19409f170..d23dd4e5922 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.243",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.243",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-23.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.243",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.243",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-23-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-23"
+  "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"
+  }
 }
\ 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 e9300622b3d..afe516d3de0 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.244",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.244",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-24.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.244",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.244",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-24-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-24"
+  "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"
+  }
 }
\ 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 9153704448f..7e91cf622a7 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.245",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.245",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-25.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.245",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.245",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-25-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-25"
+  "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"
+  }
 }
\ 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 e89788ca0cf..6551d81284d 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.223",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.223",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-3.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.223",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.223",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-3-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-3"
+  "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"
+  }
 }
\ 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 d2dc146e908..29ca5be5aff 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.224",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.224",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-4.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.224",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.224",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-4-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-4"
+  "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"
+  }
 }
\ 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 ba4c05f1561..4b89877f7eb 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.225",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.225",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-5.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.225",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.225",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-5-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-5"
+  "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"
+  }
 }
\ 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 67565d44899..11a97f52b00 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.226",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.226",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-6.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.226",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.226",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-6-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-6"
+  "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"
+  }
 }
\ 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 77561e39b14..b0218421add 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.227",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.227",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-7.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.227",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.227",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-7-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-7"
+  "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"
+  }
 }
\ 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 e7992d3a3c3..e717fcd67cf 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.228",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.228",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-8.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.228",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.228",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-8-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-8"
+  "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"
+  }
 }
\ 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 f9d5de47534..557e38a5f82 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
-  },
-  "main_memory": {
-    "ram_size": 25769803776,
-    "virtual_size": null
+    "smt_size": 8,
+    "platform_type": "x86_64"
   },
   "network_adapters": [
     {
+      "mounted": true,
       "device": "eth0",
-      "driver": "igb",
+      "rate": 1000000000,
+      "ip": "131.254.202.229",
       "enabled": true,
+      "switch": "c6509-grid",
       "interface": "Ethernet",
-      "ip": "131.254.202.229",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-9.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509-grid"
+      "driver": "igb",
+      "mountable": true
     },
     {
+      "mounted": false,
       "device": "eth1",
-      "driver": "igb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": false
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "version": "MT25418",
+      "rate": 10000000000,
+      "ip": "192.168.200.229",
       "enabled": true,
       "interface": "Infiniband",
-      "ip": "192.168.200.229",
-      "mountable": true,
-      "mounted": true,
       "network_address": "parapide-9-ib0.rennes.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": 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"
+  "supported_job_types": {
+    "virtual": "ivt",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
-      "driver": "ahci",
+      "size": 465661287307.739,
       "interface": "SATA",
-      "size": 465661287307.739
+      "driver": "ahci"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "ivt"
+  "main_memory": {
+    "ram_size": 25769803776,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapide-9"
+  "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"
+  }
 }
\ 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 6381433aabe..04dea01bd16 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/parapide.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/parapide.json
@@ -1,6 +1,6 @@
 {
-  "created_at": "Sun, 24 Jan 2010 23:00:00 GMT",
-  "model": "SUN FIRE X2270",
   "type": "cluster",
-  "uid": "parapide"
+  "created_at": "Sun, 24 Jan 2010 23:00:00 GMT",
+  "uid": "parapide",
+  "model": "SUN FIRE X2270"
 }
\ 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 b98874562f1..d603dda0732 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651KY"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:a9:23",
+      "rate": 1000000000,
+      "ip": "192.168.203.1",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.1",
-      "mac": "78:e7:d1:65:a9:23",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-1-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:ef:22",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:ef:22",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:ef:23",
+      "rate": 1000000000,
+      "ip": "131.254.203.1",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:3f:30",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:3f:30",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:3f:31",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:3f:31",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG2",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "GB0250EAFYK",
-      "rev": "HPG2",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "GB0250EAFYK"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-1"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651KY"
+  }
 }
\ 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 2da3cf3e18f..44db221853f 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651KK"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:58:23:f2",
+      "rate": 1000000000,
+      "ip": "192.168.203.10",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.10",
-      "mac": "78:e7:d1:58:23:f2",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-10-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:88",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:a5:88",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:89",
+      "rate": 1000000000,
+      "ip": "131.254.203.10",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:98",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:a5:98",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:99",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:a5:99",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG2",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "GB0250EAFYK",
-      "rev": "HPG2",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "GB0250EAFYK"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-10"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651KK"
+  }
 }
\ 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 b4d8703a61a..432d08f72aa 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651L5"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:a9:6e",
+      "rate": 1000000000,
+      "ip": "192.168.203.11",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.11",
-      "mac": "78:e7:d1:65:a9:6e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-11-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:ee:f2",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:ee:f2",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:ee:f3",
+      "rate": 1000000000,
+      "ip": "131.254.203.11",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:df:ac",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:df:ac",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:df:ad",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:df:ad",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-11"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651L5"
+  }
 }
\ 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 9cdf0195f1d..0e6b52f8036 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651MC"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:f7:09:43",
+      "rate": 1000000000,
+      "ip": "192.168.203.12",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.12",
-      "mac": "78:e7:d1:f7:09:43",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-12-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:4e:c8",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:4e:c8",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:4e:c9",
+      "rate": 1000000000,
+      "ip": "131.254.203.12",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:4e:d2",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:4e:d2",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:4e:d3",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:4e:d3",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-12"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651MC"
+  }
 }
\ 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 17058a16834..f7b799a73c0 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651MP"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:b9:a1",
+      "rate": 1000000000,
+      "ip": "192.168.203.13",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.13",
-      "mac": "78:e7:d1:65:b9:a1",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-13-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:7e:f0",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:7e:f0",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:7e:f1",
+      "rate": 1000000000,
+      "ip": "131.254.203.13",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:7e:f4",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:7e:f4",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:7e:f5",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:7e:f5",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-13"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651MP"
+  }
 }
\ 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 9abc15937a5..54474dd48d1 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651JY"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:58:33:67",
+      "rate": 1000000000,
+      "ip": "192.168.203.14",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.14",
-      "mac": "78:e7:d1:58:33:67",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-14-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:5d:0c:3e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:5d:0c:3e",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:5d:0c:3f",
+      "rate": 1000000000,
+      "ip": "131.254.203.14",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:5d:0c:18",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:5d:0c:18",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:5d:0c:19",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:5d:0c:19",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-14"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651JY"
+  }
 }
\ 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 5e5683bec5b..42b9dad8541 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651LD"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:99:f6",
+      "rate": 1000000000,
+      "ip": "192.168.203.15",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.15",
-      "mac": "78:e7:d1:65:99:f6",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-15-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:4f:04",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:4f:04",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:4f:05",
+      "rate": 1000000000,
+      "ip": "131.254.203.15",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:0f:be",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:0f:be",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:0f:bf",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:0f:bf",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-15"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651LD"
+  }
 }
\ 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 beb9508446c..45b0b72e566 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651P6"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:f7:09:78",
+      "rate": 1000000000,
+      "ip": "192.168.203.16",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.16",
-      "mac": "78:e7:d1:f7:09:78",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-16-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:fa:03:78",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:fa:03:78",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:fa:03:79",
+      "rate": 1000000000,
+      "ip": "131.254.203.16",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:fa:03:5a",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:fa:03:5a",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:fa:03:5b",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:fa:03:5b",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-16"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651P6"
+  }
 }
\ 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 0371a9512f2..fd79327ea6c 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651JT"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:c9:1b",
+      "rate": 1000000000,
+      "ip": "192.168.203.17",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.17",
-      "mac": "78:e7:d1:65:c9:1b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-17-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:32",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:8e:32",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:33",
+      "rate": 1000000000,
+      "ip": "131.254.203.17",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:46",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:8e:46",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:47",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:8e:47",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-17"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651JT"
+  }
 }
\ 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 2dfbac10658..b560ee19c27 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651KF"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:58:23:db",
+      "rate": 1000000000,
+      "ip": "192.168.203.18",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.18",
-      "mac": "78:e7:d1:58:23:db",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-18-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:48",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:a5:48",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:49",
+      "rate": 1000000000,
+      "ip": "131.254.203.18",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:74",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:a5:74",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:75",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:a5:75",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG2",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "GB0250EAFYK",
-      "rev": "HPG2",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "GB0250EAFYK"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-18"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651KF"
+  }
 }
\ 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 7e61230ee05..01faff1f3b1 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651JB"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "1c:c1:de:7b:36:2e",
+      "rate": 1000000000,
+      "ip": "192.168.203.19",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.19",
-      "mac": "1c:c1:de:7b:36:2e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-19-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "d4:85:64:45:b5:36",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d4:85:64:45:b5:36",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "d4:85:64:45:b5:37",
+      "rate": 1000000000,
+      "ip": "131.254.203.19",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "d4:85:64:45:a5:f4",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d4:85:64:45:a5:f4",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "d4:85:64:45:a5:f5",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d4:85:64:45:a5:f5",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-19"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651JB"
+  }
 }
\ 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 40efef5714b..e1426697cc2 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651JH"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:58:23:dd",
+      "rate": 1000000000,
+      "ip": "192.168.203.2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.2",
-      "mac": "78:e7:d1:58:23:dd",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-2-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:a2",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:a5:a2",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:a3",
+      "rate": 1000000000,
+      "ip": "131.254.203.2",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:c4",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:a5:c4",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:c5",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:a5:c5",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-2"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651JH"
+  }
 }
\ 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 d5cfdace21a..626366ccacf 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651J7"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:a9:27",
+      "rate": 1000000000,
+      "ip": "192.168.203.20",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.20",
-      "mac": "78:e7:d1:65:a9:27",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-20-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:fe:98",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:fe:98",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:fe:99",
+      "rate": 1000000000,
+      "ip": "131.254.203.20",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:ef:42",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:ef:42",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:ef:43",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:ef:43",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-20"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651J7"
+  }
 }
\ 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 de6540315a0..4875ac4b732 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651PW"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:a9:3a",
+      "rate": 1000000000,
+      "ip": "192.168.203.21",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.21",
-      "mac": "78:e7:d1:65:a9:3a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-21-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:de:b4",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:de:b4",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:de:b5",
+      "rate": 1000000000,
+      "ip": "131.254.203.21",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:df:80",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:df:80",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:df:81",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:df:81",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-21"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651PW"
+  }
 }
\ 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 3af7765e64a..ab7defab7d5 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651NB"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "1c:c1:de:7a:ac:4d",
+      "rate": 1000000000,
+      "ip": "192.168.203.22",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.22",
-      "mac": "1c:c1:de:7a:ac:4d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-22-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "d4:85:64:43:5b:8c",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d4:85:64:43:5b:8c",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "d4:85:64:43:5b:8d",
+      "rate": 1000000000,
+      "ip": "131.254.203.22",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "d4:85:64:43:5b:8a",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d4:85:64:43:5b:8a",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "d4:85:64:43:5b:8b",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d4:85:64:43:5b:8b",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-22"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651NB"
+  }
 }
\ 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 60140299174..4573df1583a 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651P2"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:f7:09:69",
+      "rate": 1000000000,
+      "ip": "192.168.203.23",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.23",
-      "mac": "78:e7:d1:f7:09:69",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-23-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:fa:03:fa",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:fa:03:fa",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:fa:03:fb",
+      "rate": 1000000000,
+      "ip": "131.254.203.23",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:fa:13:4a",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:fa:13:4a",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:fa:13:4b",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:fa:13:4b",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-23"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651P2"
+  }
 }
\ 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 703b5214299..70c8dcb2109 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651N6"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:f7:09:84",
+      "rate": 1000000000,
+      "ip": "192.168.203.24",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.24",
-      "mac": "78:e7:d1:f7:09:84",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-24-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:fa:03:44",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:fa:03:44",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:fa:03:45",
+      "rate": 1000000000,
+      "ip": "131.254.203.24",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:fa:03:18",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:fa:03:18",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:fa:03:19",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:fa:03:19",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-24"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651N6"
+  }
 }
\ 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 470da2f5563..2b8440f9d8c 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651MV"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:a9:4a",
+      "rate": 1000000000,
+      "ip": "192.168.203.25",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.25",
-      "mac": "78:e7:d1:65:a9:4a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-25-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:5e:28",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:5e:28",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:5e:29",
+      "rate": 1000000000,
+      "ip": "131.254.203.25",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:5e:32",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:5e:32",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:5e:33",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:5e:33",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-25"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651MV"
+  }
 }
\ 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 b57de8ca730..cc4b3cba56c 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651LW"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:99:ff",
+      "rate": 1000000000,
+      "ip": "192.168.203.26",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.26",
-      "mac": "78:e7:d1:65:99:ff",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-26-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:0f:c6",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:0f:c6",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:0f:c7",
+      "rate": 1000000000,
+      "ip": "131.254.203.26",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f6:a0:4e",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f6:a0:4e",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f6:a0:4f",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f6:a0:4f",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-26"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651LW"
+  }
 }
\ 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 4bc7020a409..5d33609a6f0 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651M1"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:c9:48",
+      "rate": 1000000000,
+      "ip": "192.168.203.27",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.27",
-      "mac": "78:e7:d1:65:c9:48",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-27-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:3e:e2",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:3e:e2",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:3e:e3",
+      "rate": 1000000000,
+      "ip": "131.254.203.27",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:4e:b0",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:4e:b0",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:4e:b1",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:4e:b1",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-27"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651M1"
+  }
 }
\ 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 f4f2411bb7b..43f43b7d3e8 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651JD"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:c9:2d",
+      "rate": 1000000000,
+      "ip": "192.168.203.28",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.28",
-      "mac": "78:e7:d1:65:c9:2d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-28-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:52",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:8e:52",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:53",
+      "rate": 1000000000,
+      "ip": "131.254.203.28",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:4c",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:8e:4c",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:4d",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:8e:4d",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-28"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651JD"
+  }
 }
\ 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 146a2552d24..5ba2d0a2b4d 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651K4"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:58:33:77",
+      "rate": 1000000000,
+      "ip": "192.168.203.29",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.29",
-      "mac": "78:e7:d1:58:33:77",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-29-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:d5:80",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:d5:80",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:d5:81",
+      "rate": 1000000000,
+      "ip": "131.254.203.29",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:c5:c6",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:c5:c6",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:c5:c7",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:c5:c7",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-29"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651K4"
+  }
 }
\ 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 4511284118d..89948cba306 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651K8"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:c9:2a",
+      "rate": 1000000000,
+      "ip": "192.168.203.3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.3",
-      "mac": "78:e7:d1:65:c9:2a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-3-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:fa:13:30",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:fa:13:30",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:fa:13:31",
+      "rate": 1000000000,
+      "ip": "131.254.203.3",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:fa:13:26",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:fa:13:26",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:fa:13:27",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:fa:13:27",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-3"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651K8"
+  }
 }
\ 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 c5a2b7391d7..ba9700f261f 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651N2"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:b9:cf",
+      "rate": 1000000000,
+      "ip": "192.168.203.30",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.30",
-      "mac": "78:e7:d1:65:b9:cf",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-30-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:04",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:8e:04",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:05",
+      "rate": 1000000000,
+      "ip": "131.254.203.30",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:7e:d6",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:7e:d6",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:7e:d7",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:7e:d7",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-30"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651N2"
+  }
 }
\ 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 068f1fb9494..3657e9dacbd 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651LJ"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:b9:4e",
+      "rate": 1000000000,
+      "ip": "192.168.203.31",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.31",
-      "mac": "78:e7:d1:65:b9:4e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-31-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:be:38",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:be:38",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:be:39",
+      "rate": 1000000000,
+      "ip": "131.254.203.31",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:be:3a",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:be:3a",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:be:3b",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:be:3b",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-31"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651LJ"
+  }
 }
\ 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 91bb1d27ff8..7a187692043 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651L9"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:58:23:fc",
+      "rate": 1000000000,
+      "ip": "192.168.203.32",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.32",
-      "mac": "78:e7:d1:58:23:fc",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-32-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:6c",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:a5:6c",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:6d",
+      "rate": 1000000000,
+      "ip": "131.254.203.32",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:4c",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:a5:4c",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:4d",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:a5:4d",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-32"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651L9"
+  }
 }
\ 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 127d66b74f1..c2e55b2eaf4 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651P9"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:a9:7a",
+      "rate": 1000000000,
+      "ip": "192.168.203.33",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.33",
-      "mac": "78:e7:d1:65:a9:7a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-33-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:6f:52",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:6f:52",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:6f:53",
+      "rate": 1000000000,
+      "ip": "131.254.203.33",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:6f:54",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:6f:54",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:6f:55",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:6f:55",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-33"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651P9"
+  }
 }
\ 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 d0bd2c6738a..c019763f1f1 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651NV"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:b9:36",
+      "rate": 1000000000,
+      "ip": "192.168.203.34",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.34",
-      "mac": "78:e7:d1:65:b9:36",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-34-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:ae:80",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:ae:80",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:ae:81",
+      "rate": 1000000000,
+      "ip": "131.254.203.34",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:ae:7c",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:ae:7c",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:ae:7d",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:ae:7d",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-34"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651NV"
+  }
 }
\ 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 60c267eead4..3dd192bec8b 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651PH"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:b9:72",
+      "rate": 1000000000,
+      "ip": "192.168.203.35",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.35",
-      "mac": "78:e7:d1:65:b9:72",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-35-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:ae:20",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:ae:20",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:ae:21",
+      "rate": 1000000000,
+      "ip": "131.254.203.35",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:ae:3c",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:ae:3c",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:ae:3d",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:ae:3d",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-35"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651PH"
+  }
 }
\ 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 08376a8fc18..875affdc509 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651NR"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:b9:fb",
+      "rate": 1000000000,
+      "ip": "192.168.203.36",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.36",
-      "mac": "78:e7:d1:65:b9:fb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-36-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:72",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:8e:72",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:73",
+      "rate": 1000000000,
+      "ip": "131.254.203.36",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:a0",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:8e:a0",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:a1",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:8e:a1",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-36"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651NR"
+  }
 }
\ 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 900d41eadc3..17c20355497 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651P3"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:f7:09:42",
+      "rate": 1000000000,
+      "ip": "192.168.203.37",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.37",
-      "mac": "78:e7:d1:f7:09:42",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-37-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:3e:f8",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:3e:f8",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:3e:f9",
+      "rate": 1000000000,
+      "ip": "131.254.203.37",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:3e:fa",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:3e:fa",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:3e:fb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:3e:fb",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-37"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651P3"
+  }
 }
\ 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 095aa2313f8..46acf15febf 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651M7"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:a9:0f",
+      "rate": 1000000000,
+      "ip": "192.168.203.38",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.38",
-      "mac": "78:e7:d1:65:a9:0f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-38-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:3f:5a",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:3f:5a",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:3f:5b",
+      "rate": 1000000000,
+      "ip": "131.254.203.38",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:fe:ee",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:fe:ee",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:fe:ef",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:fe:ef",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-38"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651M7"
+  }
 }
\ 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 4c871518276..0ffd5e6c6fd 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651NW"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:b9:65",
+      "rate": 1000000000,
+      "ip": "192.168.203.39",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.39",
-      "mac": "78:e7:d1:65:b9:65",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-39-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:ae:40",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:ae:40",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:ae:41",
+      "rate": 1000000000,
+      "ip": "131.254.203.39",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:ae:44",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:ae:44",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:ae:45",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:ae:45",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-39"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651NW"
+  }
 }
\ 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 4e26441197f..338a73166b0 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651NH"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:c9:4f",
+      "rate": 1000000000,
+      "ip": "192.168.203.4",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.4",
-      "mac": "78:e7:d1:65:c9:4f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-4-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:5e:34",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:5e:34",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:5e:35",
+      "rate": 1000000000,
+      "ip": "131.254.203.4",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:5e:58",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:5e:58",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:5e:59",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:5e:59",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-4"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651NH"
+  }
 }
\ 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 eb2071532b6..abb1ec7745f 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651KS"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:58:33:0b",
+      "rate": 1000000000,
+      "ip": "192.168.203.40",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.40",
-      "mac": "78:e7:d1:58:33:0b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-40-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:e2",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:a5:e2",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:e3",
+      "rate": 1000000000,
+      "ip": "131.254.203.40",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:ec",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:a5:ec",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:a5:ed",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:a5:ed",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG2",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "GB0250EAFYK",
-      "rev": "HPG2",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "GB0250EAFYK"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-40"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651KS"
+  }
 }
\ 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 7f470c26e0a..67c55230e26 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651PN"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:58:33:1d",
+      "rate": 1000000000,
+      "ip": "192.168.203.5",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.5",
-      "mac": "78:e7:d1:58:33:1d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-5-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:5d:2c:44",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:5d:2c:44",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:5d:2c:45",
+      "rate": 1000000000,
+      "ip": "131.254.203.5",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:5d:2c:34",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:5d:2c:34",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:5d:2c:35",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:5d:2c:35",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-5"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651PN"
+  }
 }
\ 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 51593c3a437..8977a084bb0 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651NM"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:58:33:50",
+      "rate": 1000000000,
+      "ip": "192.168.203.6",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.6",
-      "mac": "78:e7:d1:58:33:50",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-6-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:95:e8",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:95:e8",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:95:e9",
+      "rate": 1000000000,
+      "ip": "131.254.203.6",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:95:ec",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:95:ec",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "d8:d3:85:e6:95:ed",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "d8:d3:85:e6:95:ed",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-6"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651NM"
+  }
 }
\ 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 1c96967c288..591ac974309 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651J9"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:99:eb",
+      "rate": 1000000000,
+      "ip": "192.168.203.7",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.7",
-      "mac": "78:e7:d1:65:99:eb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-7-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:0f:38",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:0f:38",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:0f:39",
+      "rate": 1000000000,
+      "ip": "131.254.203.7",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:ef:88",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:ef:88",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f5:ef:89",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f5:ef:89",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-7"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651J9"
+  }
 }
\ 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 621d3654778..e0e2bfaa109 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651MH"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:c9:56",
+      "rate": 1000000000,
+      "ip": "192.168.203.8",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.8",
-      "mac": "78:e7:d1:65:c9:56",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-8-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:4e:d6",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:4e:d6",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:4e:d7",
+      "rate": 1000000000,
+      "ip": "131.254.203.8",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:4e:fa",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:4e:fa",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:4e:fb",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:4e:fb",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-8"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651MH"
+  }
 }
\ 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 6f8afd5745a..b2003530007 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
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "chassis": {
-    "serial_number": "GB803651P0"
-  },
-  "main_memory": {
-    "ram_size": 51539607552,
-    "virtual_size": null
+    "smt_size": 24,
+    "platform_type": "amd64"
   },
   "network_adapters": [
     {
+      "mounted": false,
       "device": "bmc",
+      "mac": "78:e7:d1:65:b9:e1",
+      "rate": 1000000000,
+      "ip": "192.168.203.9",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.203.9",
-      "mac": "78:e7:d1:65:b9:e1",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
       "network_address": "parapluie-9-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
+      "management": true,
+      "mountable": false
     },
     {
       "device": "eth0",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:f6",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:8e:f6",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "mounted": true,
       "device": "eth1",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:f7",
+      "rate": 1000000000,
+      "ip": "131.254.203.9",
       "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",
-      "rate": 1000000000
+      "driver": "igb",
+      "mountable": true
     },
     {
       "device": "eth2",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:e4",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:8e:e4",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
       "device": "eth3",
-      "driver": "igb",
+      "mac": "78:e7:d1:f9:8e:e5",
+      "rate": 1000000000,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "78:e7:d1:f9:8e:e5",
-      "rate": 1000000000
+      "driver": "igb"
     },
     {
+      "vendor": "Mellanox",
+      "mounted": true,
       "device": "ib0",
-      "driver": "mlx4_core",
+      "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",
       "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",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "driver": "mlx4_core",
+      "mountable": true
     },
     {
+      "vendor": "Mellanox",
       "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "interface": "Infiniband",
       "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,
-      "vendor": "Mellanox",
-      "version": "MT25418"
+      "enabled": false,
+      "interface": "Infiniband",
+      "driver": "mlx4_core"
     }
   ],
-  "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"
+  "supported_job_types": {
+    "virtual": "amd-v",
+    "deploy": true,
+    "besteffort": true
   },
   "storage_devices": [
     {
+      "rev": "HPG0",
       "device": "sda",
-      "driver": "ahci",
+      "size": 250059350016,
       "interface": "SATA",
-      "model": "VB0250EAVER",
-      "rev": "HPG0",
-      "size": 250059350016
+      "driver": "ahci",
+      "model": "VB0250EAVER"
     }
   ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+  "main_memory": {
+    "ram_size": 51539607552,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "parapluie-9"
+  "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"
+  },
+  "chassis": {
+    "serial_number": "GB803651P0"
+  }
 }
\ 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 056d5116f6b..5cdd944a557 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json
@@ -1,6 +1,6 @@
 {
-  "created_at": "Mon, 01 Nov 2010 23:00:00 GMT",
-  "model": "HP ProLiant DL165 G7",
   "type": "cluster",
-  "uid": "parapluie"
+  "created_at": "Mon, 01 Nov 2010 23:00:00 GMT",
+  "uid": "parapluie",
+  "model": "HP ProLiant DL165 G7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/rennes.json b/data/grid5000/sites/rennes/rennes.json
index c589b942030..73ad759b9f2 100755
--- a/data/grid5000/sites/rennes/rennes.json
+++ b/data/grid5000/sites/rennes/rennes.json
@@ -1,15 +1,15 @@
 {
-  "compilation_server": false,
-  "description": "",
-  "email_contact": "rennes-staff@lists.grid5000.fr",
+  "type": "site",
+  "user_support_contact": "rennes-staff@lists.grid5000.fr",
   "latitude": 48.1,
-  "location": "Rennes, France",
+  "uid": "rennes",
   "longitude": -1.6667,
+  "compilation_server": false,
+  "email_contact": "rennes-staff@lists.grid5000.fr",
+  "sys_admin_contact": "rennes-staff@lists.grid5000.fr",
   "name": "Rennes",
+  "location": "Rennes, France",
+  "description": "",
   "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/toulouse/clusters/pastel/nodes/pastel-1.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json
index bdecabd9e58..7e2b4748bf9 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:82:92",
       "ip": "172.16.113.1",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:82:92",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-1.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:E0:82:93",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:E0:82:93",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:8E:3E",
       "ip": "192.168.24.1",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:8E:3E",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-1-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-1"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 8ab0e3063ff..2423bded369 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:80:1A",
       "ip": "172.16.113.10",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:80:1A",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-10.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:E0:80:1B",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:E0:80:1B",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:8E:8D",
       "ip": "192.168.24.10",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:8E:8D",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-10-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-10"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 3bb154b331f..2f7b96183de 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:EF:48",
       "ip": "172.16.113.11",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:EF:48",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-11.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:D2:EF:49",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:D2:EF:49",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:DF:0A:99",
       "ip": "192.168.24.11",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:DF:0A:99",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-11-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-11"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 aaba91f990e..3f69b46bb4f 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F7:13",
       "ip": "172.16.113.12",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F7:13",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-12.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F7:14",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F7:14",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:EC",
       "ip": "192.168.24.12",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:EC",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-12-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-12"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 9c361e3dbd9..3856937fd2c 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:79:C2",
       "ip": "172.16.113.13",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:79:C2",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-13.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:E0:79:C3",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:E0:79:C3",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:8C:16",
       "ip": "192.168.24.13",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:8C:16",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-13-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-13"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 eac841ea4da..623537ea9a0 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:F1:C4",
       "ip": "172.16.113.14",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:F1:C4",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-14.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:D2:F1:C5",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:D2:F1:C5",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:F8:1C",
       "ip": "192.168.24.14",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:F8:1C",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-14-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-14"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 8b97161107b..c352c6d282a 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:7B:46:51",
       "ip": "172.16.113.15",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:7B:46:51",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-15.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:7B:46:52",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:7B:46:52",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:7B:48:7C",
       "ip": "192.168.24.15",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:7B:48:7C",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-15-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-15"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 853190919a4..967499954dc 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:DF:09:0E",
       "ip": "172.16.113.16",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:DF:09:0E",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-16.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:DF:09:0F",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:DF:09:0F",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:DF:0A:74",
       "ip": "192.168.24.16",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:DF:0A:74",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-16-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-16"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 134a3e8325f..756b5f8947b 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F5:C3",
       "ip": "172.16.113.17",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F5:C3",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-17.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F5:C4",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F5:C4",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FD:4A",
       "ip": "192.168.24.17",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FD:4A",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-17-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-17"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 8129f5a4758..3c2cc3ec7cc 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:F0:40",
       "ip": "172.16.113.18",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:F0:40",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-18.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:D2:F0:41",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:D2:F0:41",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:F7:A0",
       "ip": "192.168.24.18",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:F7:A0",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-18-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-18"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 1e8ec66c98c..fe0b0ce0146 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D7:4D:40",
       "ip": "172.16.113.19",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D7:4D:40",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-19.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:D7:4D:41",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:D7:4D:41",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D7:5B:DC",
       "ip": "192.168.24.19",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D7:5B:DC",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-19-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-19"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 cb9f3be51ed..1293560bc94 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F8:83",
       "ip": "172.16.113.2",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F8:83",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-2.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F8:84",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F8:84",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:4C",
       "ip": "192.168.24.2",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:4C",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-2-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-2"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 404ec3429db..f02ea79aa09 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D7:4E:F4",
       "ip": "172.16.113.20",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D7:4E:F4",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-20.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:D7:4E:F5",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:D7:4E:F5",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D7:5C:C2",
       "ip": "192.168.24.20",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D7:5C:C2",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-20-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-20"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 095bf416f0e..ffae11bf7d5 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:3D:CA:9D",
       "ip": "172.16.113.21",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:3D:CA:9D",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-21.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:3D:CA:9E",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:3D:CA:9E",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:3D:CB:95",
       "ip": "192.168.24.21",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:3D:CB:95",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-21-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-21"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 94a6a5299e4..7b93c292b96 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F8:63",
       "ip": "172.16.113.22",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F8:63",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-22.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F8:64",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F8:64",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:69",
       "ip": "192.168.24.22",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:69",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-22-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-22"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 5ff51e2f444..659efbe58e4 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:E7",
       "ip": "172.16.113.23",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F6:E7",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-23.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F6:E8",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F6:E8",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:E0",
       "ip": "192.168.24.23",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:E0",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-23-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-23"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 1511a1aaed6..965194a1b54 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FA:7F",
       "ip": "172.16.113.24",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FA:7F",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-24.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:FA:80",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:FA:80",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FB:ED",
       "ip": "192.168.24.24",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FB:ED",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-24-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-24"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 db690cbcfcd..97706ce1ca2 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FA:43",
       "ip": "172.16.113.25",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FA:43",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-25.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:FA:44",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:FA:44",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:12",
       "ip": "192.168.24.25",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:12",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-25-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-25"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 0442cd2761b..d00c2362758 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F7:B3",
       "ip": "172.16.113.26",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F7:B3",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-26.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F7:B4",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F7:B4",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:9B",
       "ip": "192.168.24.26",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:9B",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-26-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-26"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 c8d7136dc48..d49834bee09 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F8:37",
       "ip": "172.16.113.27",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F8:37",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-27.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F8:38",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F8:38",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:61",
       "ip": "192.168.24.27",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:61",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-27-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-27"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 54b039d1712..46d1cc24fd5 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:EC:D0",
       "ip": "172.16.113.28",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:EC:D0",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-28.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:D2:EC:D1",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:D2:EC:D1",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:F7:01",
       "ip": "192.168.24.28",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:F7:01",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-28-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-28"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 658ec7059b1..d34ae40bd3b 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F5:BF",
       "ip": "172.16.113.29",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F5:BF",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-29.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F5:C0",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F5:C0",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FD:49",
       "ip": "192.168.24.29",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FD:49",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-29-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-29"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 125192a1c28..0b2c25cc151 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:DF:09:12",
       "ip": "172.16.113.3",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:DF:09:12",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-3.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:DF:09:13",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:DF:09:13",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:DF:0A:75",
       "ip": "192.168.24.3",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:DF:0A:75",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-3-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-3"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 1db6a1a7b11..e09e865c3b0 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:DF:08:C2",
       "ip": "172.16.113.30",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:DF:08:C2",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-30.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:DF:08:C3",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:DF:08:C3",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:F7:A3",
       "ip": "192.168.24.30",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:F7:A3",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-30-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-30"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 d17151b5f04..815b3f8386f 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:F3:58",
       "ip": "172.16.113.31",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:F3:58",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-31.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:D2:F3:59",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:D2:F3:59",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:F8:50",
       "ip": "192.168.24.31",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:F8:50",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-31-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-31"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 e46d661926f..3a20d92bf85 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:78:92",
       "ip": "172.16.113.32",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:78:92",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-32.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:E0:78:93",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:E0:78:93",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:8B:CA",
       "ip": "192.168.24.32",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:8B:CA",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-32-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-32"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 4ff0616f76a..501f7236ee5 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:79:5E",
       "ip": "172.16.113.33",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:79:5E",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-33.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:E0:79:5F",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:E0:79:5F",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:8B:FD",
       "ip": "192.168.24.33",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:8B:FD",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-33-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-33"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 ce9c54cc7cf..1a301ed8f59 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:81:D6",
       "ip": "172.16.113.34",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:81:D6",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-34.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:E0:81:D7",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:E0:81:D7",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:8E:12",
       "ip": "192.168.24.34",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:8E:12",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-34-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-34"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 6b1f3317859..10a14af46bd 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:83",
       "ip": "172.16.113.35",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F6:83",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-35.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F6:84",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F6:84",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FD:07",
       "ip": "192.168.24.35",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FD:07",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-35-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-35"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 9fa0a93c456..0d9a0e633ca 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F7:17",
       "ip": "172.16.113.36",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F7:17",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-36.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F7:18",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F7:18",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:ED",
       "ip": "192.168.24.36",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:ED",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-36-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-36"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 449bfe3a8da..e57bad57abb 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:47",
       "ip": "172.16.113.37",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F6:47",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-37.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F6:48",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F6:48",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FD:11",
       "ip": "192.168.24.37",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FD:11",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-37-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-37"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 8584476d0f7..cb2b699d55e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:DF:09:0A",
       "ip": "172.16.113.38",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:DF:09:0A",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-38.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:DF:09:0B",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:DF:09:0B",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:F6:E1",
       "ip": "192.168.24.38",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:F6:E1",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-38-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-38"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 2dbf8190484..9460b876c74 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:F0:3C",
       "ip": "172.16.113.39",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:F0:3C",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-39.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:D2:F0:3D",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:D2:F0:3D",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:F7:9F",
       "ip": "192.168.24.39",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:F7:9F",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-39-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-39"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 07f3bec2f79..96a95edab4e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:7E:D6",
       "ip": "172.16.113.4",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:7E:D6",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-4.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:E0:7E:D7",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:E0:7E:D7",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:8D:40",
       "ip": "192.168.24.4",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:8D:40",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-4-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-4"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 521661f837b..ab04158d13c 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:EF:44",
       "ip": "172.16.113.40",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:EF:44",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-40.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:D2:EF:45",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:D2:EF:45",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:DF:0A:97",
       "ip": "192.168.24.40",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:DF:0A:97",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-40-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-40"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 41899b57a8f..c3b61312f7c 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:78:36",
       "ip": "172.16.113.41",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:78:36",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-41.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:E0:78:37",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:E0:78:37",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:8B:B3",
       "ip": "192.168.24.41",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:8B:B3",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-41-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-41"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 563a07d1d02..3af86755c07 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:79:6A",
       "ip": "172.16.113.42",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:79:6A",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-42.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:E0:79:6B",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:E0:79:6B",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:8C:00",
       "ip": "192.168.24.42",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:8C:00",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-42-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-42"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 5e92395580e..699cdcafb8a 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:F3:9C",
       "ip": "172.16.113.43",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:F3:9C",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-43.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:D2:F3:9D",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:D2:F3:9D",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:DF:0A:D4",
       "ip": "192.168.24.43",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:DF:0A:D4",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-43-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-43"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 e8448e1ace5..72587001146 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F8:F3",
       "ip": "172.16.113.44",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F8:F3",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-44.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F8:F4",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F8:F4",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:40",
       "ip": "192.168.24.44",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:40",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-44-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-44"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 eb5d430d144..85a26547ec4 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:9F",
       "ip": "172.16.113.45",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F6:9F",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-45.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F6:A0",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F6:A0",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FD:1A",
       "ip": "192.168.24.45",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FD:1A",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-45-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-45"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 5ebcb181ba6..e0bacd3b82b 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FA:A3",
       "ip": "172.16.113.46",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FA:A3",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-46.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:FA:A4",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:FA:A4",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FB:F8",
       "ip": "192.168.24.46",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FB:F8",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-46-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-46"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 14ba629825d..367ce8621b5 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FA:3F",
       "ip": "172.16.113.47",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FA:3F",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-47.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:FA:40",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:FA:40",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:11",
       "ip": "192.168.24.47",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:11",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-47-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-47"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 161b38507d4..efd87590ecf 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:AB",
       "ip": "172.16.113.48",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F6:AB",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-48.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F6:AC",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F6:AC",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FD:20",
       "ip": "192.168.24.48",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FD:20",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-48-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-48"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 ab6dbaefe0d..0cc8d09847e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:4B",
       "ip": "172.16.113.49",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F6:4B",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-49.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F6:4C",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F6:4C",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FD:13",
       "ip": "192.168.24.49",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FD:13",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-49-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-49"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 a608222d105..fec4a972846 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:78:2E",
       "ip": "172.16.113.5",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:78:2E",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-5.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:E0:78:2F",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:E0:78:2F",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:8B:B1",
       "ip": "192.168.24.5",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:8B:B1",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-5-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-5"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 1af258982e3..98b313a08dc 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E7:78:05",
       "ip": "172.16.113.50",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E7:78:05",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-50.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:E7:78:06",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:E7:78:06",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E7:80:A6",
       "ip": "192.168.24.50",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E7:80:A6",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-50-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-50"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 366ffeb206c..fce1655f571 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F9:BF",
       "ip": "172.16.113.51",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F9:BF",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-51.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F9:C0",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F9:C0",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:C2",
       "ip": "192.168.24.51",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:C2",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-51-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-51"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 36c53873fe4..87449b7a45a 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F8:CB",
       "ip": "172.16.113.52",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F8:CB",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-52.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F8:CC",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F8:CC",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:36",
       "ip": "192.168.24.52",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:36",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-52-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-52"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 e445f7eb091..13a23a6cc80 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:63",
       "ip": "172.16.113.53",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F6:63",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-53.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F6:64",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F6:64",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FD:1B",
       "ip": "192.168.24.53",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FD:1B",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-53-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-53"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 38b30642b3b..a02d1d584e5 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F8:8B",
       "ip": "172.16.113.54",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F8:8B",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-54.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F8:8C",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F8:8C",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:4E",
       "ip": "192.168.24.54",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:4E",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-54-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-54"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 38f3d9682ee..d65c37d74c0 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F9:D7",
       "ip": "172.16.113.55",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F9:D7",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-55.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F9:D8",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F9:D8",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:C9",
       "ip": "192.168.24.55",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:C9",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-55-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-55"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 d41ba93f3c4..8900eb96ac4 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B9:DB",
       "ip": "172.16.113.56",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:B9:DB",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-56.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:B9:DC",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:B9:DC",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:C1:2D",
       "ip": "192.168.24.56",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:C1:2D",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-56-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-56"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 0b18a32f23c..a49b98d0214 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B9:0B",
       "ip": "172.16.113.57",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:B9:0B",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-57.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:B9:0C",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:B9:0C",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:C0:F9",
       "ip": "192.168.24.57",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:C0:F9",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-57-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-57"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 aea0da2b8a6..35723f106a6 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B9:13",
       "ip": "172.16.113.58",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:B9:13",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-58.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:B9:14",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:B9:14",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:C0:FB",
       "ip": "192.168.24.58",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:C0:FB",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-58-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-58"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 1032eee562d..521ab0911cb 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F7:07",
       "ip": "172.16.113.59",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F7:07",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-59.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F7:08",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F7:08",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:E9",
       "ip": "192.168.24.59",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:E9",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-59-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-59"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 6cd20517355..76dd66b375d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:EE:F8",
       "ip": "172.16.113.6",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:EE:F8",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-6.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:D2:EE:F9",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:D2:EE:F9",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:F7:DD",
       "ip": "192.168.24.6",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:F7:DD",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-6-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-6"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 ec5a6094ad6..209d9982a7d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:3B",
       "ip": "172.16.113.60",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F6:3B",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-60.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F6:3C",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F6:3C",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FD:0D",
       "ip": "192.168.24.60",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FD:0D",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-60-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-60"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 b747dc6622a..54a3de0b1bd 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F7:C7",
       "ip": "172.16.113.61",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F7:C7",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-61.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F7:C8",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F7:C8",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:9E",
       "ip": "192.168.24.61",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:9E",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-61-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-61"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 ff7604a768d..2d9e01dbbe6 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F7:9B",
       "ip": "172.16.113.62",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F7:9B",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-62.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F7:9C",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F7:9C",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:94",
       "ip": "192.168.24.62",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:94",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-62-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-62"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 c2314652dd7..fa6c1212506 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B7:17",
       "ip": "172.16.113.63",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:B7:17",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-63.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:B7:18",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:B7:18",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:C0:54",
       "ip": "192.168.24.63",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:C0:54",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-63-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-63"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 d56a9fbec87..3080fcb9f05 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:23:8B:8A:36:69",
       "ip": "172.16.113.64",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:23:8B:8A:36:69",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-64.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:23:8B:8A:36:6A",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:23:8B:8A:36:6A",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:23:8B:8A:34:4E",
       "ip": "192.168.24.64",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:23:8B:8A:34:4E",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-64-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-64"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 648c21509f3..8359fc2e87e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": null,
       "ip": "172.16.113.65",
+      "enabled": true,
       "ip6": null,
-      "mac": null,
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-65.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": null,
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:1D:EE:58",
       "ip": "192.168.24.65",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:1D:EE:58",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-65-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-65"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 f22f67f2d1a..9425fa692d8 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F7:9F",
       "ip": "172.16.113.66",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F7:9F",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-66.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F7:A0",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F7:A0",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:98",
       "ip": "192.168.24.66",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:98",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-66-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-66"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 190f1570a8f..713df8e06cd 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F8:D3",
       "ip": "172.16.113.67",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F8:D3",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-67.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F8:D4",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F8:D4",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:38",
       "ip": "192.168.24.67",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:38",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-67-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-67"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 f45dba54e9f..fc475c6a93d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:E0:56:D7",
       "ip": "172.16.113.68",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:E0:56:D7",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-68.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:E0:56:D8",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:E0:56:D8",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:E0:57:D2",
       "ip": "192.168.24.68",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:E0:57:D2",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-68-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-68"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 2f950c3cd98..1558608302d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F9:F7",
       "ip": "172.16.113.69",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F9:F7",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-69.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F9:F8",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F9:F8",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:D4",
       "ip": "192.168.24.69",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:D4",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-69-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-69"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 e489a5963ce..e32a468d27f 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:EF:38",
       "ip": "172.16.113.7",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:EF:38",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-7.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:D2:EF:39",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:D2:EF:39",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:DF:0A:6E",
       "ip": "192.168.24.7",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:DF:0A:6E",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-7-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-7"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 354b9215d1e..78909f381bc 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B6:23",
       "ip": "172.16.113.70",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:B6:23",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-70.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:B6:24",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:B6:24",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:BF:EF",
       "ip": "192.168.24.70",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:BF:EF",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-70-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-70"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 cd36bd5235a..7ff79625026 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F8:A7",
       "ip": "172.16.113.71",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F8:A7",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-71.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F8:A8",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F8:A8",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:55",
       "ip": "192.168.24.71",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:55",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-71-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-71"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 6f9b763617e..69044d654f4 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B8:97",
       "ip": "172.16.113.72",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:B8:97",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-72.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:B8:98",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:B8:98",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:C0:3D",
       "ip": "192.168.24.72",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:C0:3D",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-72-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-72"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 8c356195501..62744e3a13f 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B6:FF",
       "ip": "172.16.113.73",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:B6:FF",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-73.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:B7:00",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:B7:00",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:C0:4E",
       "ip": "192.168.24.73",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:C0:4E",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-73-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-73"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 8a6241c0791..973e73c2a1a 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:FF:D6:02",
       "ip": "172.16.113.74",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:FF:D6:02",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-74.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:FF:D6:03",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:FF:D6:03",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:FF:D9:BE",
       "ip": "192.168.24.74",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:FF:D9:BE",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-74-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-74"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 06720c67c2f..e79697f1a51 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:EB",
       "ip": "172.16.113.75",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F6:EB",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-75.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F6:EC",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F6:EC",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FC:E1",
       "ip": "192.168.24.75",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FC:E1",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-75-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-75"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 3c6c686080e..436abe8d5ac 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B9:17",
       "ip": "172.16.113.76",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:B9:17",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-76.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:B9:18",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:B9:18",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:C0:FC",
       "ip": "192.168.24.76",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:C0:FC",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-76-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-76"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 4f6cc300cb3..af370d08dd5 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:B7:1B",
       "ip": "172.16.113.77",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:B7:1B",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-77.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:B7:1C",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:B7:1C",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:C0:55",
       "ip": "192.168.24.77",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:C0:55",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-77-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-77"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 05b119993a5..21944b60529 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:F6:B3",
       "ip": "172.16.113.78",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:F6:B3",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-78.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:1B:24:2D:F6:B4",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:1B:24:2D:F6:B4",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:1B:24:2D:FD:22",
       "ip": "192.168.24.78",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:1B:24:2D:FD:22",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-78-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-78"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 0bd366b5b53..05248a3d3bd 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:EE:2C",
       "ip": "172.16.113.79",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:EE:2C",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-79.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:D2:EE:2D",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:D2:EE:2D",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:D2:F8:8D",
       "ip": "192.168.24.79",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:D2:F8:8D",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-79-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-79"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 90c65805750..dcaeec43b0a 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:78:B2",
       "ip": "172.16.113.8",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:78:B2",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-8.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:E0:78:B3",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:E0:78:B3",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E0:8B:D2",
       "ip": "192.168.24.8",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E0:8B:D2",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-8-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-8"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 fd1fc7a9a1e..7dcfd4b903f 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E7:77:6D",
       "ip": "172.16.113.80",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E7:77:6D",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-80.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:E7:77:6E",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:E7:77:6E",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:E7:80:80",
       "ip": "192.168.24.80",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:E7:80:80",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-80-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-80"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 39e97345ee7..92698f8d434 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4
+    "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"
   },
   "main_memory": {
     "ram_size": 8589934592,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:76:52:AB",
       "ip": "172.16.113.9",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:76:52:AB",
+      "interface": "Ethernet",
       "management": false,
+      "version": "MCP55 Pro",
+      "driver": "forcedeth",
       "mountable": true,
-      "mounted": true,
+      "switch": "r4",
       "network_address": "pastel-9.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "r4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth0",
+      "vendor": "NVIDIA"
     },
     {
-      "device": "eth1",
+      "mac": "00:16:36:76:52:AC",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:76:52:AC",
       "management": false,
+      "version": "MCP55 Pro",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
+      "device": "eth1",
+      "vendor": "NVIDIA"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:16:36:76:56:C5",
       "ip": "192.168.24.9",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:16:36:76:56:C5",
+      "interface": "Ethernet",
       "management": true,
+      "version": "BCM5715c",
       "mountable": false,
-      "mounted": false,
+      "switch": "<unknown>",
       "network_address": "pastel-9-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
+      "vendor": "Broadcom"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
     "clock_speed": 2613000000,
+    "cache_l2": 1048576,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "2218",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "2218"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "size": 232830643653.87
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "pastel-9"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 4cd0a164b9d..e0294c6a998 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/pastel.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/pastel.json
@@ -1,6 +1,6 @@
 {
-  "created_at": "Wed, 28 Nov 2007 23:00:00 GMT",
-  "model": "Sun Fire X2200 M2",
   "type": "cluster",
-  "uid": "pastel"
+  "uid": "pastel",
+  "model": "Sun Fire X2200 M2",
+  "created_at": "Wed, 28 Nov 2007 23:00:00 GMT"
 }
\ 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 8b93c341e6d..8e7e0a260ef 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-1.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-1.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3E:A1",
       "ip": "192.168.22.3",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3E:A1",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-1.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:3E:A2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:3E:A2",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3E:A3",
       "ip": "192.168.23.3",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3E:A3",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-1-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": false,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-1"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 78053ac60f8..6bf0ebbf16c 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-10.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-10.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:35:FB",
       "ip": "192.168.22.12",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:35:FB",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-10.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:35:FC",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:35:FC",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:35:FD",
       "ip": "192.168.23.12",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:35:FD",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-10-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-10"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 e0a60929b2b..04dbdf9d511 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-11.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-11.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:35:CB",
       "ip": "192.168.22.13",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:35:CB",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-11.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:35:CC",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:35:CC",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:35:CD",
       "ip": "192.168.23.13",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:35:CD",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-11-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-11"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 58088e29c6c..b9877c2513f 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-12.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-12.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3B:BE",
       "ip": "192.168.22.14",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3B:BE",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-12.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:3B:BF",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:3B:BF",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3B:C0",
       "ip": "192.168.23.14",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3B:C0",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-12-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-12"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 630ec69bb1d..36684f5bd15 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-13.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-13.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3B:8B",
       "ip": "192.168.22.15",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3B:8B",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-13.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:3B:8C",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:3B:8C",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3B:8D",
       "ip": "192.168.23.15",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3B:8D",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-13-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-13"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 8a3d891288f..9d9cc19dd16 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-14.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-14.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3E:01",
       "ip": "192.168.22.16",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3E:01",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-14.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:3E:02",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:3E:02",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3E:03",
       "ip": "192.168.23.16",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3E:03",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-14-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-14"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 9000daf1175..305751d98b2 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-15.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-15.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:13:F6",
       "ip": "192.168.22.17",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:13:F6",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-15.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:13:F7",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:13:F7",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:13:F8",
       "ip": "192.168.23.17",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:13:F8",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-15-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-15"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 f6dda00dc2b..3ae00cef9f7 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-16.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-16.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3E:DB",
       "ip": "192.168.22.18",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3E:DB",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-16.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:3E:DC",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:3E:DC",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3E:DD",
       "ip": "192.168.23.18",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3E:DD",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-16-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-16"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 7c5313c3f3e..cb8515d19fe 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-17.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-17.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:37:7B",
       "ip": "192.168.22.19",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:37:7B",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-17.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:37:7C",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:37:7C",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:37:7D",
       "ip": "192.168.23.19",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:37:7D",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-17-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-17"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 bda989014fa..7972f9ba642 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-18.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-18.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:B8:9F",
       "ip": "192.168.22.20",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:B8:9F",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-18.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:B8:A0",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:B8:A0",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:B8:A1",
       "ip": "192.168.23.20",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:B8:A1",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-18-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-18"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 068e00b908e..f8d9196cef3 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-19.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-19.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:36:0D",
       "ip": "192.168.22.21",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:36:0D",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-19.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:36:0E",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:36:0E",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:36:0F",
       "ip": "192.168.23.21",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:36:0F",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-19-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-19"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 30c34e56a69..511d9414dda 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-2.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-2.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3B:D0",
       "ip": "192.168.22.4",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3B:D0",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-2.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:3B:D1",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:3B:D1",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3B:D2",
       "ip": "192.168.23.4",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3B:D2",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-2-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-2"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 e826a60e6d1..545e15b1f44 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-20.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-20.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:36:0A",
       "ip": "192.168.22.22",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:36:0A",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-20.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:36:0B",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:36:0B",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:36:0C",
       "ip": "192.168.23.22",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:36:0C",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-20-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-20"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 c8d804a77d5..fd60187c0c2 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-21.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-21.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:34:A2",
       "ip": "192.168.22.23",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:34:A2",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-21.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:34:A3",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:34:A3",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:34:A4",
       "ip": "192.168.23.23",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:34:A4",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-21-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-21"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 d8c12cf9093..19b71427743 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-22.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-22.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:13:E7",
       "ip": "192.168.22.24",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:13:E7",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-22.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:13:E8",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:13:E8",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:13:E9",
       "ip": "192.168.23.24",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:13:E9",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-22-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-22"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 08f653863d4..982d9ee1cc1 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-23.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-23.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3D:8C",
       "ip": "192.168.22.25",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3D:8C",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-23.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:3D:8D",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:3D:8D",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3D:8E",
       "ip": "192.168.23.25",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3D:8E",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-23-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-23"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 029928d1ba5..c56c92efda6 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-24.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-24.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:36:31",
       "ip": "192.168.22.26",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:36:31",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-24.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:36:32",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:36:32",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:36:33",
       "ip": "192.168.23.26",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:36:33",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-24-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-24"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 9dac4e4498c..526fc54e1d0 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-25.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-25.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:10:AF",
       "ip": "192.168.22.27",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:10:AF",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-25.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:10:B0",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:10:B0",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:10:B1",
       "ip": "192.168.23.27",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:10:B1",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-25-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-25"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 76d370aabb3..7b7b8720a2a 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-26.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-26.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:13:F9",
       "ip": "192.168.22.28",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:13:F9",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-26.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:13:FA",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:13:FA",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:13:FB",
       "ip": "192.168.23.28",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:13:FB",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-26-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-26"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 a0393298a2a..9515a8b901f 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-27.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-27.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:12:F1",
       "ip": "192.168.22.29",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:12:F1",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-27.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:12:F2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:12:F2",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:12:F3",
       "ip": "192.168.23.29",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:12:F3",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-27-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-27"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 541ec0f9308..c90b50196c4 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-28.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-28.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:13:C6",
       "ip": "192.168.22.30",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:13:C6",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-28.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:13:C7",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:13:C7",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:13:CB",
       "ip": "192.168.23.30",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:13:CB",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-28-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-28"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 d6234a0b2bb..dad40d57894 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-29.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-29.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:14:CE",
       "ip": "192.168.22.31",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:14:CE",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-29.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:14:CF",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:14:CF",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:14:0D",
       "ip": "192.168.23.31",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:14:0D",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-29-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-29"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 fd0119488aa..27d851fe4a1 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-3.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-3.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3D:AD",
       "ip": "192.168.22.5",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3D:AD",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-3.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:3D:AE",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:3D:AE",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3D:AF",
       "ip": "192.168.23.5",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3D:AF",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-3-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-3"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 ff46b4c0b4a..d67586f19c2 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-30.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-30.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:14:8F",
       "ip": "192.168.22.32",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:14:8F",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-30.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:14:90",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:14:90",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:14:91",
       "ip": "192.168.23.32",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:14:91",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-30-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-30"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 7fd108e2324..a2873b45fd8 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-31.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-31.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3B:37",
       "ip": "192.168.22.33",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3B:37",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-31.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:3B:38",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:3B:38",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3B:39",
       "ip": "192.168.23.33",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3B:39",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-31-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-31"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 f4a4be6ad2b..9a377fc903e 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-32.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-32.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:7F:F2",
       "ip": "192.168.22.34",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:7F:F2",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-32.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:7F:F7",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:7F:F7",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:7F:F8",
       "ip": "192.168.23.34",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:7F:F8",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-32-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-32"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 84865bb61eb..6bf10805c0c 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-33.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-33.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:45:0E",
       "ip": "192.168.22.35",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:45:0E",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-33.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:45:0F",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:45:0F",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:45:10",
       "ip": "192.168.23.35",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:45:10",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-33-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-33"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 a01f46c137d..b7d64752788 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-34.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-34.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:66:16",
       "ip": "192.168.22.36",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:66:16",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-34.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:66:17",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:66:17",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:66:18",
       "ip": "192.168.23.36",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:66:18",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-34-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-34"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 c91403e2f05..980a4e423ef 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-35.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-35.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:6C:F3",
       "ip": "192.168.22.37",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:6C:F3",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-35.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:6C:F4",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:6C:F4",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:6C:F5",
       "ip": "192.168.23.37",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:6C:F5",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-35-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-35"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 22ad36da987..df49fd1ff42 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-36.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-36.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:D4:DB",
       "ip": "192.168.22.38",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:D4:DB",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-36.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:D4:DC",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:D4:DC",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:D4:DD",
       "ip": "192.168.23.38",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:D4:DD",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-36-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-36"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 f1e08032790..504c61e7ac1 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-37.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-37.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:9F:78",
       "ip": "192.168.22.39",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:9F:78",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-37.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:9F:79",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:9F:79",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:9F:7A",
       "ip": "192.168.23.39",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:9F:7A",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-37-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-37"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 ca245b7046c..aa691cd08ba 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-38.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-38.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:3F:12",
       "ip": "192.168.22.40",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:3F:12",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-38.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:3F:13",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:3F:13",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:3F:14",
       "ip": "192.168.23.40",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:3F:14",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-38-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-38"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 d5bade22a31..65592197fc4 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-39.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-39.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:3F:D5",
       "ip": "192.168.22.41",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:3F:D5",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-39.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:3F:D6",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:3F:D6",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:3F:D7",
       "ip": "192.168.23.41",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:3F:D7",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-39-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-39"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 bf9e00fe75b..15282107859 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-4.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-4.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:38:6E",
       "ip": "192.168.22.6",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:38:6E",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-4.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:38:6F",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:38:6F",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:38:70",
       "ip": "192.168.23.6",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:38:70",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-4-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-4"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 5268306217d..6be561819a1 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-40.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-40.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:3F:39",
       "ip": "192.168.22.42",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:3F:39",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-40.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:3F:3A",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:3F:3A",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:3F:3B",
       "ip": "192.168.23.42",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:3F:3B",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-40-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-40"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 022f279cff6..a3a1324c0ca 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-41.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-41.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:3D:CC",
       "ip": "192.168.22.43",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:3D:CC",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-41.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:3D:CD",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:3D:CD",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:3D:CE",
       "ip": "192.168.23.43",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:3D:CE",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-41-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-41"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 c2a460fb7fe..f2cb961e122 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-42.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-42.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:77:4B",
       "ip": "192.168.22.44",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:77:4B",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-42.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:77:4C",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:77:4C",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:77:4D",
       "ip": "192.168.23.44",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:77:4D",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-42-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-42"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 fec0f6ce43e..76a201fc456 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-43.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-43.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:DC:2C",
       "ip": "192.168.22.45",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:DC:2C",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-43.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:DC:2D",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:DC:2D",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:DC:2E",
       "ip": "192.168.23.45",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:DC:2E",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-43-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-43"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 5f923f0da57..20c38b872fb 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-44.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-44.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:68:4F",
       "ip": "192.168.22.46",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:68:4F",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-44.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:68:50",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:68:50",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:68:51",
       "ip": "192.168.23.46",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:68:51",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-44-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-44"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 ec3224f1926..25b0613eae3 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-45.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-45.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:6A:75",
       "ip": "192.168.22.47",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:6A:75",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-45.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:6A:76",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:6A:76",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:6A:77",
       "ip": "192.168.23.47",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:6A:77",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-45-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-45"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 a597eb6dc59..bd88efcb3f8 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-46.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-46.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:2D:79",
       "ip": "192.168.22.48",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:2D:79",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-46.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:2D:7A",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:2D:7A",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:2D:7B",
       "ip": "192.168.23.48",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:2D:7B",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-46-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-46"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 1285d94f3b5..7a685f1f347 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-47.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-47.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:3F:69",
       "ip": "192.168.22.49",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:3F:69",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-47.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:3F:6A",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:3F:6A",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:3F:6B",
       "ip": "192.168.23.49",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:3F:6B",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-47-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-47"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 9477a0be367..4f1c7ee309e 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-48.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-48.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:66:73",
       "ip": "192.168.22.50",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:66:73",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-48.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:66:74",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:66:74",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:66:75",
       "ip": "192.168.23.50",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:66:75",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-48-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-48"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 1482de35182..bb61c1b5a51 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-49.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-49.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:8D:D5",
       "ip": "192.168.22.51",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:8D:D5",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-49.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:8D:D6",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:8D:D6",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:8D:D7",
       "ip": "192.168.23.51",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:8D:D7",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-49-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-49"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 9e652ad26de..4cc5144ebb0 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-5.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-5.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:39:82",
       "ip": "192.168.22.7",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:39:82",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-5.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:39:83",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:39:83",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:39:84",
       "ip": "192.168.23.7",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:39:84",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-5-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-5"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 a7526a1ab47..971cce37d6f 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-50.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-50.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:DC:54",
       "ip": "192.168.22.52",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:DC:54",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-50.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:DC:55",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:DC:55",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:DC:56",
       "ip": "192.168.23.52",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:DC:56",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-50-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-50"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 01f9f57fed9..4f612b334af 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-51.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-51.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:82:3D",
       "ip": "192.168.22.53",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:82:3D",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-51.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:82:3E",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:82:3E",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:82:3F",
       "ip": "192.168.23.53",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:82:3F",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-51-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-51"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 bd1c8bc6fa3..1760549feff 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-52.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-52.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:80:91",
       "ip": "192.168.22.54",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:80:91",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-52.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:12:80:92",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:12:80:92",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:12:80:93",
       "ip": "192.168.23.54",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:12:80:93",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-52-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-52"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 11b4f9fb53b..f422118470e 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-6.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-6.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:2D:E1",
       "ip": "192.168.22.8",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:2D:E1",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-6.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:2D:E2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:2D:E2",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:2D:E3",
       "ip": "192.168.23.8",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:2D:E3",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-6-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-6"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 5cbcad7ca3a..4b56ee0a7b4 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-7.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-7.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3E:3A",
       "ip": "192.168.22.9",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3E:3A",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-7.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:3E:3B",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:3E:3B",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3E:3C",
       "ip": "192.168.23.9",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3E:3C",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-7-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-7"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 c294a593b7b..9afd8fad01f 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-8.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-8.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:2F:55",
       "ip": "192.168.22.10",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:2F:55",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-8.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:2F:56",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:2F:56",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:2F:57",
       "ip": "192.168.23.10",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:2F:57",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-8-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-8"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 1598b73ffde..dfd72d63958 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-9.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-9.json
@@ -1,8 +1,22 @@
 {
+  "type": "node",
   "architecture": {
-    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_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
   },
   "main_memory": {
     "ram_size": 2147483648,
@@ -10,80 +24,66 @@
   },
   "network_adapters": [
     {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3E:07",
       "ip": "192.168.22.11",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3E:07",
+      "interface": "Ethernet",
       "management": false,
+      "version": "BCM5703X",
+      "driver": "tg3",
       "mountable": true,
-      "mounted": true,
+      "switch": "cict-switch",
       "network_address": "violette-9.toulouse.grid5000.fr",
+      "mounted": true,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth0",
+      "vendor": "Broadcom"
     },
     {
-      "device": "eth1",
+      "mac": "00:09:3D:10:3E:08",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:09:3D:10:3E:08",
       "management": false,
+      "version": "BCM5703X",
       "mountable": false,
+      "switch": null,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "vendor": "Broadcom",
-      "version": "BCM5703X"
+      "device": "eth1",
+      "vendor": "Broadcom"
     },
     {
-      "enabled": true,
-      "interface": "Ethernet",
+      "mac": "00:09:3D:10:3E:09",
       "ip": "192.168.23.11",
+      "enabled": true,
       "ip6": null,
-      "mac": "00:09:3D:10:3E:09",
+      "interface": "Ethernet",
       "management": true,
+      "version": "?",
       "mountable": false,
-      "mounted": false,
+      "switch": "cict-switch",
       "network_address": "violette-9-bmc.toulouse.grid5000.fr",
+      "mounted": false,
       "rate": 1000000000,
-      "switch": "cict-switch",
-      "vendor": "?",
-      "version": "?"
+      "vendor": "?"
     }
   ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
   "processor": {
-    "cache_l1": null,
     "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": null,
     "clock_speed": 2190000000,
+    "cache_l2": null,
     "instruction_set": "",
-    "model": "AMD Opteron",
+    "version": "248",
     "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "size": 67986547946.9299
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
+    "cache_l1": null,
+    "model": "AMD Opteron",
+    "cache_l1i": null,
+    "vendor": "AMD"
   },
-  "type": "node",
-  "uid": "violette-9"
+  "operating_system": {
+    "version": null,
+    "name": null,
+    "release": null
+  }
 }
\ 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 ec1b67f2f6a..8959951def8 100755
--- a/data/grid5000/sites/toulouse/clusters/violette/violette.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/violette.json
@@ -1,6 +1,6 @@
 {
-  "created_at": "Tue, 31 Aug 2004 22:00:00 GMT",
-  "model": "Sun Fire V20z",
   "type": "cluster",
-  "uid": "violette"
+  "uid": "violette",
+  "model": "Sun Fire V20z",
+  "created_at": "Tue, 31 Aug 2004 22:00:00 GMT"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/toulouse.json b/data/grid5000/sites/toulouse/toulouse.json
index ed1882a1621..5b652437d84 100755
--- a/data/grid5000/sites/toulouse/toulouse.json
+++ b/data/grid5000/sites/toulouse/toulouse.json
@@ -1,14 +1,14 @@
 {
-  "description": "",
-  "email_contact": null,
+  "type": "site",
+  "user_support_contact": null,
   "latitude": 43.6167,
-  "location": "Toulouse, France",
+  "uid": "toulouse",
   "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