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 17d1604d0221c8cea48604a25d1de700a39ef247..e46cffd59b434a18c966e719e6ac8be39c3cd99e 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 886aa26b7290964b6d7cd5674232b7b68c459c52..0025709410ea1b11197320817112c0843e997b3a 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 da7f10ff4850df615c8a53148e8914bbb6f1dc62..f651af3498e779df989935a3857e51a6913ebdf0 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 33328a4153c75194d99f59a3eb3d337f3dfa8499..c20fad350d77a03617878c85892fc3c93acd4396 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 cefb9fb204512c13ae625019453939699a18b405..ef054f6df738ff46e50074926ec0a7fc8d060e1b 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 1acb344dcb594996d8cdc9a8909035a71504c317..70e360804490d9b177f70b02ea15afd71df1513b 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 f8a671af6c22b0f79f4252eb01cb8affbcba7192..53253b2198dc479a7ffbcef5c3beb44a85e2617a 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 5542bc4f3b038b7d339b8d3efd4aded3c2a762ac..371432a1669b9fe8af6901f0e61ea8701bca2222 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 37db9ca04f5240a61db87ac9edc7af6f7708558a..72de24e22d9e3d5486c52dba4a23b17434f44769 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 5cb34e47e8d74101fad64a799057de882c0cc528..280fedbc5c42a7abe095eeb85191b2babfe9c710 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 1a8efc1e7c4345258b183a88b7b31f394f9f94f9..437aecaf8db739f8e3b4c6d32b8bdeab70886f83 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 5e1da0b83a40249c62fce4c19ab7ac8096f9dd45..9734ee28c122584a28ab3d4bded774df456dbd96 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 1ce1f9aa8f7d2f7cc55834b8271965f75f5f08b9..be92db4883960d1a0213e811bf1acbe0eca060b1 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 11b7a504e8ecadb4547e7ca340743b2042824ee7..970e94345baad01842880313d326732fbe57ba80 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 208e28d143ae19348858debd635dcc1c34bb4045..0c2f7445b8ea6e00e8924c255ed6290b894ffeec 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 5dff7083cc4f157952c200f7adb8a9d3867afd8a..b9803718aa862db93bc750380b19b1643011e8a4 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 c9a0d26b5b256a79e3d61c5b581b3509a6ac443f..925ba6f3508ddbb896e2315f045c81bbcae70b29 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 8170fd2084fa7a58ddbee2cb6fc86f0cae89a0b3..31e8548193dee1b10ecfa9e9fcbdb18090f31de5 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 4009a8e2eff0df840dbdf5d65c517a217a8fa809..22989d3aba5a987b00a9880b4e73307253b16aa9 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 8910d67eb12879d26dbd946154d55133dfa3b8c2..0e61fb61fe9b85ab5281c3eddde288e0ad49fd67 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 e0917642866e3acc4e9cc4364eb9e9cad0a2e232..592a20f19721466b0a95ea66006824b8359dac8f 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 f97666d5fb9379e31588f918c373785f7292ebd6..c1a0d53ee66f31373f24ae96c1f27bf4d6d79c40 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 2f982af82a6fb1f685ff55ff33027632a6cef49c..a3b25f6345f85c2cd7b7785ed83d2671f71f8fa3 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 30f02d9a2e0f414ab0ebb99fa0f3e0312c985ad9..39ef1284d9c7cb023e2e09125f81d3baac219092 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 ae9044e4d798d5c22410daf59cead1f18b4b64ac..19f4bcbf4214f6cf2f70d50fa04969df9aadabf7 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 4a054bad243310fcd59feb5c396d406e0427e0f5..c508d6522ffb69e0a1c6e76343c1cc90dc013dab 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 4c4b38e272da61d3ec6ab75e0f8a59d1c16815c3..65cb8282e679230ba9ccd05773b891951b01dc85 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 d73e7112372e3aedaed1a7dd4dae483cb416e6eb..be8be5b970faba25346fc990c3e4572f68a107fc 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 77a46b2ffb76b320e3d4787d96f3639ca0ce8cf8..683ecfff86534e2d1e4c4eb92370a1c3e9bde147 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 27f12840ad32507453a24af920368f529cfb1bb4..3722c26e01c958cd2509a1e2960fac53bc0ee93b 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 cb1565e63c5796a87ebe03947de321873f8665aa..54063f9e6c240dd82d4227dbdacd0d5e4f69f711 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 f65749d27c137413e814403f47b8b971e15b6a9a..5245ce8be24eeb93d9825a8cc003f8d157f5c475 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 3da20595adc09910955bedfff66bb264d848762c..54fd8a89d4d862cbfbe8ae736ea65689fcadf3aa 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 5f462d9c5ab68ef2e7f24f1bc0d5c6d59f812d60..4452e5dcce3d5cd42421837764f592cbf4c9dfbe 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 60f669ff43a89dbf6c16c7d25f76333c74518efe..efb811fe3e7ce544c19db3d4c2c92c7f2fa8fcc3 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 c58286394aa40e13ffc56a99b5e1146f4609edab..4c43ebb9a9f65208069eb0aa267bb7cac98707b4 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 f68dbae7ec3a5076a22b22a693aed8dcfe9e5a7b..2bc4f8cf1edf393dfe48be884ca85043b841bd6a 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 4801bdc274f327ea51b6070649b37d1c043c6fea..dbf539c7d42ff036c8947ec5bffafd303db4d743 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 42ef8e0474a6b8c30562165e60d28e9499b4b570..7f679db402afb8c5681d4c9045193061e03cbd9e 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 4d05f6869332181999824ef2aa59af31aa4cae0a..d6ebad668575098add6ce7b09b18b8563e0a97ec 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 8447c4b9d57068e2a34434ace335744ce3e719c3..b758bdd9280de78a187adb7e5a0343a617a4f21f 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 60a000571e5f4e8e1bebeeeb16e6b3c31f87ddb4..ab5f04e54e0c668864c7a04afaa986748ec7dd75 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 07bb064371450d71b81a2316b546fd9d5499d25e..d1d80afa86ccb025d5b2071235db251ccb5b3da9 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 2b0e177407fc6b7984b6f6256d07880cdd7a14ea..9897823b7999b7de40745b1167b365d2688fa3f5 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 f50d1bd97efd7ea75024b5c1cde8a2007a429986..8b8321c7986ddb6c328c1a87259e274b345d1e14 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 9121a7f719cf27e902ee418cc2a59458adc64e4b..727170855308d9fc4fe2e1d54d41035b9c13994c 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 e78ad8f6204bf9743a242daa111c501b3dd65f60..b30b89273fffa8f0c65a2356b07803d8ef8d14cd 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 cea2a41ce257a7ba0dd4b3b84748d78f0d8151c6..e6aee4e6ea4719ce987fda652851a2234103b814 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 ca374afcc32e9f492d112a994f125820a19f1367..37c090fa81973ad2c258f96ae29fe0cb24cfccf0 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 3de170ae6ce77e6f9d872be3b0e9d900b0a44a93..555a48c787282e8f8f08dadd41a0f042cd97e15e 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 2f1848c20098eb28a8ad22081e1ed02011299111..dd94729ad3718f28575cd47a44507f80043a2e96 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 73716e3a582d3e93cc8fedd312156d8f5db89160..ac51a9c9a75689f27dd66aaefdc40cd3d777fa20 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 ec7fb51716ca71b9e88091cd5537fc7d064154ac..318c531f816625df0f11d0ce501c505eae6c8a5c 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 e641c4ce19894ba417eae2c68cf51a741ae91cbe..9501880c04032c5a07653985556e36c72bbf14ef 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 34bd88e20dd9be02d1cc392d03223d7527c99f2f..99ff8ca2551ee5dd780075377d557a2606d8e460 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 8d84e83e7ab52d48048a2cbcafa5e43c3c47a87a..0583d0d2a78afd940333a9c724a91cc4c5dde1bc 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 ce5d24a111dba0aa2a89dc276d9d046ca95d3cb3..8f5ee9f377e762b7b8b5b035269df8b3521ebb65 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 3e1182f615e7e1a2ef795b6cbfd5da091553bb6f..8b59da5d60993bed8cef006d226042fa781ea32f 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 fdb6e2a2d075d3f7c6301b52439490cfe9cb3d0b..e576b916d1d2473a48e59f143836347eed03d7a4 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 cee0140168d0f4086a3b97af87b7ce8c7c02843c..3ed02e34be9cd5bcbd1e5920b86531ca342ce199 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 77e498a085ccdaeabc4e255400188c03c93b9d7e..96c9da38cb2bbbf85653434425eea17128e6dfc2 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 25f4554594bbec38b5870bd8318a04a5d675a6bb..0d83d97e11f88e7688e800313b1b6cb3f8890887 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 fc5827566b79fd2d8becbecde16a6e6fe47ed01d..30fa2e2f044f94eae767c5f4df6e7df53907cfa2 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 045e4da476f8197e110a27523cd3d9301dfad86c..df2f109f375a0824447dfe4a9cabc936d54a4da9 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 f3124659462a79621010fe835479d38a51853a4f..a5642117a59b5e3f58df06ad6ae3cfee72ede793 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 1ee1ef23cdd52dc2ed57b7c1c47cf1b8ad7f108d..d9269ea9452e558281818bcbe38f6bb069614120 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 b4e69352c2b05be41e464fe0faf21f2578bfab5d..1e62bd50013278da5f2f8424edfb1dd8dd09fe39 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 84ab13d69be3f8a0f5bc50484d53a05cfeac23df..79990ffbb792c64b4a7ecccc7e4a034e61414ddf 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 bf1520d8df0fa8e8c00e4bc2bae4bfbc1f9576c8..32e7afd15a80ddca2378bf99d433d6b84f860a89 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 e49c8cad3ebbdc373590ec44d374d25281f46898..3bef693d5738a6a834f402ab3efa2ba9828a7f51 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 7d3f6dbf41999824f88ed9d33842a12d00518ce8..9a9bf4120c79c7519a8bf218a4d2e9e05294250f 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 f2b9a7c6914837162dfe32510abb3802113978c8..50668bca7ac55d6edf713555005db61d6db96024 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 9af1266e497a095296aedf0fea1414f06c1b159d..0171ca1b11742aca127d11df04257e9e9d44b170 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 dc21d1cd87f7fe1b96acad70dd242b09c5b33eb2..adaa1b8d457f0aa0395db1f637fb905007b97317 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 2b5a242313c5e499a6e17af3d741e8364ba65d44..646e9e7d0da0407bcdfca9c125bff6a369f154f9 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 d5be9f0a6f7567a84e2087eba0dc0ac2f2b1152d..3fff21c13c89a3e085741bd2a51674a51e16cf96 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 52da67624902056cd301ff8546fc3132fe3912b8..858c7f708bd48eff30856915ebb6aaec52ed1ee2 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 0340f0bb5b119c4618143d777c03b4446d87bcf0..3ba466d768d7d101078d1448ed7dcac5aff18b39 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 b393457f129a7c119437dfba091cffab254ea3f2..c6ea44d6b88ab09df841e79f36dce18d32d76a4b 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 dd90eca3b297d08fb42e9dffc0163786bb260cdb..a9ae38df767deaa16dfea1d22da3e759174b2149 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 fdddfac00e21f919d8cf404cfadefef6dedf65c7..3528582de2f44b06738dee9c60a31702611043cd 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 c0732b8bc4889b455e80433af5f1004fe9d32246..58a4d66b23b75833185224f4ee90b771ec0d990d 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 cffd0283c194ed06a3775337f5fe1158679e5206..3920f9c219669873c07efaea9c36518a380529b9 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 5995f54256320ed2fb39fc957cdaffcab73285d7..a0ea19a8471f01300878624f13407a98864aac84 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 6b6b5625e918cc530e592a91e741ce1a74c40113..c913cd9c95097a6e0dc682c4af0860cca5b6c233 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 183fc3e10aa3c75847e30229537f38a99cee2f26..c22ffbb06c027a75c49d13da2cc71ecb2940b45a 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 f77c7353c77b7d584326e1e2f65e1b9c32929405..e3d598300b5848963d127461e8149a9967a232cf 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 edfb98d95492b9b94520174df8820e4f806948c2..07f1ad86b9b285e2a524fcb4563614d4a48ea5b8 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 c74bb4db6c7284b0013baaf357ed03b2288419fc..8984ffe30e80d76aff88159e52d21f2059ddc4af 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 a77f721662b36cb98c7213ae6e375ac88b042d5c..d139c8920149cd7f5388fd21fc880f7318d4875c 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 17bb1cb6336fe886581860575243abe05a339ba1..1a6cfcf5b67fe6263ba6aa54ad1fd93131f165c4 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 40fed283bb3f09bb78cc0002e9fe919233eedf3b..b9c33a225a499b2151bca180f390c234d27f007a 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 18fb3d8344ce552c7d6a640a7e69c36d12c7b9ed..7bd1570c4686d5b4f45ccb4fae688323dca069b2 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 6083cf5eb537c13e5f9fbc7866a6688fb8baaa64..47a31a3a31e20784123765b8bbba95d06de154e6 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 95501d28e684371f26f9c7e4494e0278388c7177..933d3e47f4794143bb8c833c107954267f84669d 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 f50a2d071428d805a05ed5c16b61981ef65a9b8a..7a648026b3a70edd0f844224654dfc906069b904 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 7b5885b1dce0a8237ee9ea0df7d7512267987f88..b6701938d72f847cf7ed518b4947ba883d8ad0bc 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 48f2fd399591785d368331c53a9c4e9bb3c029c2..f57b1bd198f84a771f749069ea4c5ed8fb38b258 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 3cbc5c2e21f2f9bc03a07dcfbfb3c8f3dafa14ed..959bf6b2ce996aeb854729c213bdbbdbedb96a84 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 674f4e32cf7124b039727d4ef4ce572ebcf91654..0dc88c78b8a1a76b468c7930f1558bb00a4ba833 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 1dd0e0edee6f2e4f71d3a09225a29c0ef3ad15f0..58b163da2bca055360b3f3bb6426e71bf04f74e3 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 eea24086479d4b604ca30f6db8c50780d540c3a2..1409dc1382921eb6950ada91c04d495803eb35ff 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 045f2e87f9313bbcffe5282c40dc70612a1a474c..8bb3a7fd82d575094e5d83e898eb810b830a9372 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 f7d2e18f45c68a8b4908d8558bd48a167ecf159a..855c30a7ef36fd9614cfe6565f3f0815c9dad603 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 c7ffa51df28038f2133fc5355418953cb6ba2974..2416b15c4ed17ec9a699eccae9a99629a7dce695 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 99ec8730965fdc7be524ba0b9368e3aed24bdea4..156a7c45e447f24c9eb27149988bca00b56189f9 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 a1d469e096a3dbe2335ff19fb65edff591cba09d..c135007e594238e80c22d2fa18259082587e0876 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 a62eac2ef6a9960af3620ad46749a4a32f67f5b3..3c263f0329e959640ba81f958309c03c77d2c0b9 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 d8fb27fa4b3ebdc89091a16d25d647a0af6387b3..a15a1cb6d1f142a061589b970db004573c4fe781 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 d30364a897ff6adb49098e2815d21e6deaf13ed3..8dc6ebc6e4cdbc7aee7db4789ff2a02e740b2042 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 b42fb7c15f9b7bfabdc250b14b7e50f45d03e5f6..e2663bdee24a56eb6135526bec94f0652382aab8 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 701afecdb697eda0678809982cf74e570640abfb..3f4f43fc11df26debbb448c612900908a9b158e1 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 60131260997a635740e0e283003b80c7c88c9d95..5d0c82bb8c2ad5bd83d5674e089fafc77ddf49f2 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 f07fd8faba3f67cc5093814ced7593218491121e..62b66dab46e388743d3c72bc398ec2ced010eb14 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 0a19409f170a94dfb5d4a0e79560c36fb5419ee0..d23dd4e5922cd3f6910f866feb3032745393d9c5 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 e9300622b3df873023d4f8c8e50698d8ca2ef768..afe516d3de0cb035f1dc3a02e8d5748d3a9b6b15 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 9153704448fa8436d4d8a864a566244b75afbf14..7e91cf622a720fb15a33db9c72556b316bdcd79a 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 e89788ca0cfe65fa872b53c85cb2928c3276b2d3..6551d81284deb65fd13d24201c762e6b6f5a19bd 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 d2dc146e908262e12c9f32c2cd5c61efb4ac89d2..29ca5be5aff71508791662ee2fa3ea408cabe534 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 ba4c05f1561f1ff3c8edbf37f79e3a2b7eab8a1a..4b89877f7ebc36aa587934206d376f2173ef7f66 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 67565d44899d65b22b6000dfa8c58611217f7f55..11a97f52b006d9cb725f7025ea25ab2c0293b849 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 77561e39b146a6a7f9a161dcf0ac38be2a03455f..b0218421add10db5e05361bfdc22197db4e7b7bd 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 e7992d3a3c33c71f64e4624916638ad76550287b..e717fcd67cf9e028ad33a90717c69d8f527b94ae 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 f9d5de475340a3c42e33ee769f8e91be0ed66da8..557e38a5f82c3f0e32a28c6b6dc0a30532c119cb 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 6381433aabe4418dcd9bb96e7015c39c2f44733e..04dea01bd16713d4d6b6d14c0b44aed36e0e1cc5 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 b98874562f1d5a04ddabc7ba4e75e0839b56875b..d603dda07328b579c9d6ee2ae03f5d6b0cb92a5d 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 2da3cf3e18f75a99b80e329920ea6a4f081923cb..44db221853f00654ebe2ba59afdb4f49900421a3 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 b4d8703a61acb79835f4dadf20c9c82a5031de68..432d08f72aaa88f18544ae3c2b46e716ee113f28 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 9cdf0195f1d140078618c56baf82d1e8c3d0fb23..0e6b52f8036b6a4c1f7623824b82c72aad6e4530 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 17058a168349caa9727b3951f26e6ea2aaf3c3df..f7b799a73c0bf75aa59b5a1ad4ae7e20cd85c2d8 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 9abc15937a5ae5b4b57cc39b43c25416aab8fd01..54474dd48d11b680e311b551cb9e30c8d147e231 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 5e5683bec5b4460c51eaa86a4fdf71ea2f7629a7..42b9dad85415395282ec21e152016529bed5a131 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 beb9508446cdd3d7ebb21328d4ac4efc58630479..45b0b72e5661d5f0a8df398dd87b4e5ad204b7a4 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 0371a9512f2d6e5bd89d9583749268ff66dea6c7..fd79327ea6cbac42b5e8e9b832822b35d687b9c7 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 2dfbac10658066437c52c3debc7638e1ca783354..b560ee19c2709b2cd28c7f2b7688e32cdbb6d372 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 7e61230ee052a6bdcfbe68bcd978a90a4078f2d8..01faff1f3b17695bdc4afc8dcc4604518293d4d8 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 40efef5714b0713ddb6089bb1e4f25b59a8a7db0..e1426697cc268361dffee0b77cef59536f3e5b36 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 d5cfdace21a5f8f5fb972b07b6c432b90b788b1e..626366ccacfeb3860c22bf241218d2de35ad0b01 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 de6540315a08343d776752d04bc0f72aa4643f2f..4875ac4b7323fedd346540f7d48cc0f438ece399 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 3af7765e64aa060a8fd051f21704ce0c396f3d0a..ab7defab7d509e693810d41bbd719c27a9a13d2a 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 60140299174aaa029fa8ac09ebde6177d20aa3bd..4573df1583a2e292a0881a0a615f7fee61301ec5 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 703b521429970535630343569e005239157f4d2a..70c8dcb2109a90ebff737b7d2e82baf52b4d2231 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 470da2f5563c22d22238249cf6a25a2946064be6..2b8440f9d8c3bc58ae815ccaebc4f96c4686f1dc 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 b57de8ca730f49d6f9318c19db5b011a99bce8a9..cc4b3cba56c0931a8632477e737dc000d60e1a33 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 4bc7020a409863b413a9e6c9977d56359594515c..5d33609a6f0ea083b5f352875bf3d61b68865e3c 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 f4f2411bb7b8f87d49d0a8888ac7da9718f3ce6a..43f43b7d3e834e3e7d0021f58f75467f39820ca3 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 146a2552d24b52d251b9b68e7b5dce8118f5837a..5ba2d0a2b4d1e81e4c473479ac39c0322590e78a 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 4511284118dcb32d64ecf6cec5a546088e21999d..89948cba3063fe33c5e28bb166b190297c7b94de 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 c5a2b7391d7e8aeee09bed1fa0a048e1da0a04a6..ba9700f261f7597cb3cc44befce32890f3fdaac1 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 068f1fb9494d16f5c5f09b85a702027d3abecd5f..3657e9dacbd2c44b11cfc9955f67228b71bccaa6 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 91bb1d27ff81dacea2418038d2f64a1c95621d29..7a187692043e9faa06513c89f3e36f16917a2a5d 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 127d66b74f109c656a14b172030a315bf9c9741d..c2e55b2eaf4c8a8be296d91f0442ad0e3a7b5ad6 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 d0bd2c6738a5f916aecf58a26198f7fcacdde681..c019763f1f1c2d85e9fe6b2e4acfaec409e9fcf9 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 60c267eead4f21620a17b7a754b80128bd53b5e5..3dd192bec8b4877f16196ffae763e0ffb74dbc8a 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 08376a8fc18ca0a2428a431fb6bed8cab9c5a60a..875affdc5090d991b949507190992affe660711a 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 900d41eadc37d1007ec493175d4f997b5cdc9175..17c203554970776d84aca525521d80137fa4751c 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 095aa2313f8c3d458acda02c02caef64b15cf21c..46acf15febfd4fec02e017284ab081c9f4428a15 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 4c871518276219cf7dd99aa1f18cd85e02d06057..0ffd5e6c6fdeaba0a9c922197e62e60ef22e9778 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 4e26441197f86d6fbc003e5a37b5e1cb22d22868..338a73166b0f75c07bb69b008c2ed401d9f71e20 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 eb2071532b69df46b352d457e0874772aae03d8e..abb1ec7745f08522937acde8d1e73d002ae44e87 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 7f470c26e0a1bd805baf3d945dd866f42e0dd4b2..67c55230e26e1361ea5e3ad939c08eb0078b9bc8 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 51593c3a437dcd4e83fede608a1f0588c17c7d63..8977a084bb03ce708f5b68d820199b1928482f0c 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 1c96967c288cb65d6aa1d87c42e51e37feb2ca08..591ac974309000ff872964176a5d3e5a17ab15bf 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 621d3654778a3a343e8b74b02edcc7ef40c6f4a7..e0e2bfaa109bec360bf42ab0b5a86c6458f25c04 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 6f8afd5745a09a7180f7ee26f8fde4ec1790ec1a..b2003530007bf888b129255a2931768796cf954c 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 056d5116f6b110d4dedd02bbc4ed478593c46a44..5cdd944a5578be1caba7368727a038d436037773 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 c589b942030a5f1f4c3fa73ee71c2594d8235021..73ad759b9f2728948b004aa7ee12afa17f61024f 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 bdecabd9e58a18ec1d363b3e52b6f71e1db0ac17..7e2b4748bf9154ae496235612289373b1cc1cee7 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 8ab0e3063ff5f42f548947cc0fb155099db01916..2423bded369aa95061019047e1dee0eb857e327b 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 3bb154b331facf08025dc1e8be6e6a3513c292de..2f7b96183de8ee60f3b84eda16521ff179e4a8d7 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 aaba91f990eee73c879c51cd3bd3e5e74393638e..3f69b46bb4f74be258a2bcd393b29df1ab76b931 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 9c361e3dbd94cd114508f74314aeeffd5c5adbcf..3856937fd2c0ef0bd492ce69104de55eb72ae7e0 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 eac841ea4dad9644f096b929202a25208e3c3e7e..623537ea9a00059e159d973576ccbf4474362c87 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 8b97161107b88d49327a0aa034d9c83614995708..c352c6d282ad35f4a32d43e1f54e80ededab31ce 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 853190919a4566b94ab153db59489999064b9ca3..967499954dc1e82882d3b7c136eca430c21b55e8 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 134a3e8325f5d905c1239f5c711f98c15fa05b5c..756b5f8947baf4d07f7e4218af2bdaded94de336 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 8129f5a475869717ffe8f50d65b48542a5b11699..3c2cc3ec7cc17f4e388c70c40b71638c0c0e9b2d 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 1e8ec66c98c7c10a228eda90162650a239deeed2..fe0b0ce014629b6b6845443ba8e8fbb304017b11 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 cb9f3be51ed772f87df47381b7efd025907f8c06..1293560bc94a7b0e8c55092763a90a5871594454 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 404ec3429db5208b86a40cb87e24f17a0121f542..f02ea79aa09d95a04bd7358aba826548e249c759 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 095bf416f0e1679a844fa49d6cddf45935a01e7f..ffae11bf7d5250c77cf139fa10575644259b28f6 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 94a6a5299e42b94ea3cd6d38d4f092843c3a0f9b..7b93c292b96ff21f4649a820c073118972767fbc 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 5ff51e2f444f52a5b92637f8cd4f752df54e4275..659efbe58e487d9d47cf260110e6ac518afe15d4 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 1511a1aaed6e79ff72c3aa4a7eb1415126a6e4ca..965194a1b546ee10879bf83897c6d82f870b039d 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 db690cbcfcd5355f09bc2e3010642885505b8646..97706ce1ca283e594dcd0a4a43830c222c1efeff 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 0442cd2761ba22d6beb33d0bcabe1bfde750f1fd..d00c236275846c633574f4fda4bab26f8f42698d 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 c8d7136dc4818f30c3609f3f0c82af8f79496581..d49834bee09ba648302282a3229fa750eb58f115 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 54b039d1712eb6047e6f7a8950ed034c2c904b42..46d1cc24fd55c0e7175f0fbdc723033e81eb35a8 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 658ec7059b14ecfb3081bdad0a8072072b635ae3..d34ae40bd3be161bd6cf18d04fd79de220a425e0 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 125192a1c284f4e9a755c4f75c024dde6cc9e4ac..0b2c25cc15148f51f6c713ade21807dd1ca5c850 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 1db6a1a7b11be6b610354b980175356ea39b0af2..e09e865c3b0e580295d22d7698b32cc2bbb47f04 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 d17151b5f0449425e3631c34effa4b0209a5dc65..815b3f8386fbc409bad9187377e4aaf334dff976 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 e46d661926f804a3d32048f38fa94f71c2427b0d..3a20d92bf857474ecd851f1b1b0cfeb05a33c8c4 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 4ff0616f76ab974dbb6bdd44d2947bd9b2b59db3..501f7236ee5feff03c35f3f651b544f3378b8912 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 ce9c54cc7cfab3fab2b196607ae44310ca846e91..1a301ed8f5945bcb43748a6c754a9a043485f21f 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 6b1f3317859568fa9ade6d3f9ccdb6e96339e384..10a14af46bdfb141d1b1fc7296c9f0b8b67d2d61 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 9fa0a93c4562c55fa4ade6fb7ef38cec41ea77ab..0d9a0e633ca8d94f8b4af6c94a562a67f639645f 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 449bfe3a8da8db1c4a855ed631f3ab2211bb7009..e57bad57abb0d6c7117c8aa6a3f469c8cfd18844 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 8584476d0f7635ee7f31b173e800a848d3e73643..cb2b699d55ecab07d5aec28bd66cbdf986cb13ee 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 2dbf8190484884a688bffc68648e48ac94e7d2a0..9460b876c745db2d44bdf78d12e16f1b14f29792 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 07f3bec2f7908baf5fb9b865d1ac1aa9f303a0b2..96a95edab4e6419e2869b540de79fb9e9ef7c76e 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 521661f837b0ee7db9952896d958a00920426b23..ab04158d13cd9518ac04ecc82c422b8f6ed39acd 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 41899b57a8f7c002de440ab481669f650cf8441c..c3b61312f7cc9764db644dc3f6a72479c8cde908 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 563a07d1d0231d4a929d9591fbac314f0a43cd63..3af86755c07ecae32d8a27543d04d053a2e0c780 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 5e92395580ee1022adc7e7f2aa807feb3705bbe4..699cdcafb8a8f1693bd507aa889808a314edf27f 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 e8448e1ace53c74a7f66d9bae8e21685512ffdba..72587001146a6b4edf7bf98dd4cc696eef4a2616 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 eb5d430d14459adc67201a4d0a284fac2a9067e5..85a26547ec4d92f7181598dfe44578cb3ba49fe8 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 5ebcb181ba6de1a7d85b649f855e7f4b259a8b0f..e0bacd3b82bd4859542c79e40df61fdd787a868c 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 14ba629825d0aff613293f1bb416a44d4f2c5319..367ce8621b5fe25d94614ab541239554cd01b70e 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 161b38507d47d3f66b51ec7cb12fcdcd3b3ddb6b..efd87590ecfb0c4b21da671aca725ef36f57cc42 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 ab6dbaefe0d4a53395b7589b920d52402b622322..0cc8d09847eb3f883822651d224a40b5a231e4f4 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 a608222d1051d6d106df0f1266c304299d6d766d..fec4a97284640add99f0be231a2e2f5ee32550c0 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 1af258982e31f9d6094a9e1bdc90d72bfa062148..98b313a08dc38a12d5ec41bd3e3d837242f9eedf 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 366ffeb206c3661e48954f0e154845745a80ac38..fce1655f571047e85e4cc779755b07128c3801fe 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 36c53873fe43d641838237463f95dce24ae206dc..87449b7a45a49a80cecddd6de25cea4d31f50ecd 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 e445f7eb09118704d2333d5b4fb013e3ab2e176f..13a23a6cc8041f92fca9d5c4f9deab922948abc2 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 38b30642b3b3966046039e542ffe7e9224a36494..a02d1d584e59b3a7cfd5ff7b12f080d81d0a0cd7 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 38f3d9682ee1fee12c3add0c7cd402736cefd77c..d65c37d74c070603d0b0da0090ad6e99e139b10c 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 d41ba93f3c41c979355c9c551ef9ebe683c8609f..8900eb96ac42eaf22114f9f29483b38626c7ca21 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 0b18a32f23ca3ba125b54410e8188b5bb274c2fd..a49b98d0214332f2495737b0e6c771206d63d6bf 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 aea0da2b8a6ac26f224a5d7f35e253cdcf09c9e9..35723f106a6e2cfd1a8238889d0d74032828e3d7 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 1032eee562d329cad8ed9ddb8c3a4e530a884dfa..521ab0911cb9f6c5b57a89892552de01915b9887 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 6cd20517355b1e070a8482c4c46c7f1098b1b219..76dd66b375da7fd0517fd8b7e28da0c1bae4036f 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 ec5a6094ad66c6912b00e44ea02a3269aaf78afe..209d9982a7d725a62896ee8f431360544385ace8 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 b747dc6622a09676068fe9da6fa38a5a7dad83b3..54a3de0b1bdfbd5d0cf9d376ad93d9154626cb86 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 ff7604a768d2b75ee52af9228dcd51a062e59527..2d9e01dbbe6efd2a2cad6cee2b9cfd5344984985 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 c2314652dd7a989a0999cadf6a8424fa0a48672c..fa6c1212506f68a90f824de7c2d0797d510954f3 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 d56a9fbec878c4205decd0f02eb64260be9fbbff..3080fcb9f0539382d848021713cd7c603ef81118 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 648c21509f31c852ec49c8a511e1ef16002914fd..8359fc2e87e8504326ac64ad4f252a80f46a16c3 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 f22f67f2d1ad883396f6e909febb995c45798ad5..9425fa692d883abdbc011f9fbb6391b33350705c 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 190f1570a8fd52d6970454f91257a172bd16e9d2..713df8e06cd2389e9232dd45b689cebea1355a4c 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 f45dba54e9f606facb1b19a206c3164cb7972114..fc475c6a93d1933bc3e804342fafccffa26af39e 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 2f950c3cd980f40072de096a3169f2508c607b30..1558608302d60475687e5bf624ea538ea1146cbb 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 e489a5963ce1b4c97108c1c8655f46a3c0831f39..e32a468d27fc35c240cd1c7a194104185f05c340 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 354b9215d1e2d219a3f38ecda33322dd5e849c91..78909f381bc7cdf43dde524b6f52eceaa50223ea 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 cd36bd5235a2bcb4e684cda8ed3a258c8af5aa31..7ff796250265442978fc954083a3fbf4846d5750 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 6f9b763617ebfdf2db4cc3463986584dccf80834..69044d654f40a8c865ac2296f899fdb1fa5614c0 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 8c356195501d06c2e73aa152bd26c083c675dbb8..62744e3a13f2bb75bb2f17f1351bde285bd6f174 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 8a6241c0791253c22dba4674a7f845b35d3b7f42..973e73c2a1a93139948bcc7e11fc81d2bd9435c7 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 06720c67c2f2e738c9255c532fe815d6dd86e207..e79697f1a51bfcd2884579205ad2161d1b5dff25 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 3c6c686080ede9baffee241d5f6cf00469860e3b..436abe8d5ac0b945b769eab5cae4b2fccb959c2c 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 4f6cc300cb3f7668bed51f6925106dba2d61f374..af370d08dd539e27b674052b2c92f2120b8219f1 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 05b119993a511009f140c9c66f5485e0b841b16d..21944b605290368bd66f7d403482766902a79a30 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 0bd366b5b53418f8b09096177029625424547d1f..05248a3d3bdd8d748d83fd7e3d68fcddabbd97d9 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 90c65805750bb4cc82a32ce1f24e35fe5f188898..dcaeec43b0a5b478e4447eb742d6167d1c8a559a 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 fd1fc7a9a1e2aab52a19a20c20743f5c66fd98b2..7dcfd4b903fe9c521c165aa2abf95a349cbba4d2 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 39e97345ee7b392caf138f856c61a59c08bb016d..92698f8d434e03ab0a27c77336ae8bf4ea59f60e 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 4cd0a164b9da4d43f13540939d6c105098fb2dc6..e0294c6a998657e55ef674429ca14014bdf4c5bd 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 8b93c341e6d7a264bd2fdff40fd083476403c5c4..8e7e0a260ef1d9f6927e2f87ba0467a21400ab3a 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 78053ac60f8b5e1abd88677fa7659f5907c00fb0..6bf0ebbf16c28d26434cc80812a3f27b9dc9f930 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 e0a60929b2b38918f57451b54ce655c260325804..04dbdf9d511cf7ae6aeb6ce7f9fb08fdc28e8e62 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 58088e29c6cad4a9ee2db807d171c637c973991a..b9877c2513fc3d0e2de2dea6beca9d1e68b7e4f0 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 630ec69bb1d99e327306cc0122d4cde310b51596..36684f5bd15f99f2ffb10466b0b1bc2d611bd2df 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 8a3d891288fcbf9cef1c3b8ddd318b83da60f834..9d9cc19dd16437ec916a52dd4563faa86a6ba034 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 9000daf1175d511dd5a50ab5bf08d825d1e63bcd..305751d98b2b65c778cfa71bee4a1aae9218fad4 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 f6dda00dc2b9491fc58a76d93f5e8e81255d3eb8..3ae00cef9f77e66264dc651cf3973b4c7e38b86d 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 7c5313c3f3e6fced076e2d622546230c8c5553e2..cb8515d19fea15c5377867fe43eaf9648956f5e8 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 bda989014fa88182a8336c4cbddef90152d17d58..7972f9ba6428975c36e7cbeda99b5cc83ba12807 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 068e00b908ebbfe4adf8d165a075d8319453eddf..f8d9196cef3c32d148fa3c588674bf48b12df00a 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 30c34e56a690b5502d7599604d784d90264fa444..511d9414dda839412b11cc06c799b3b720943960 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 e826a60e6d10db8d3211f25450f75a713fd32a06..545e15b1f44a1c4762020f1d68a47e958e68a39a 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 c8d804a77d57642077e8e4054bd1205ddfd53723..fd60187c0c2b3712b57354115d108d2eb23e57dc 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 d8c12cf9093aa0eaae73468e21a1a9f24db804c9..19b714277431d71958e6a3d979e68824871a5873 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 08f653863d46af6a82e811d587bc49ece4a00f84..982d9ee1cc19e1efd7f51809c434088f7f28aade 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 029928d1ba5c40b2f9013601d4cc19da31be87f2..c56c92efda60eb507d7ed5d7b156e7a456600369 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 9dac4e4498ca3fbbd6967e21feacd499cc4f7643..526fc54e1d01537ccc287727aa46bb7d96460952 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 76d370aabb31364e6f3229195a6b7b5910ab9f46..7b7b8720a2a10168bc13f894952bcff551c8af3e 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 a0393298a2a383f85934a2c6d41ee71ebb0b0546..9515a8b901f7eadae637abd59f6ddc6effdfe725 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 541ec0f93081b578407e2ab6399968f108e95fee..c90b50196c48f6f33597c3e8f22e5582b26c96b8 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 d6234a0b2bb2b01f4cfecd3c764084790dc15936..dad40d578949ac27e63edcda45ea7e4b9d818f8d 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 fd0119488aa7f0ec92a94b8072f4123e75977415..27d851fe4a19e745bffff0ed19ad5eff0b3ec4ed 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 ff46b4c0b4a1180f7ea7c65b9ad9194e7bca6fc3..d67586f19c24f2c0c10c9b0e39995bf0b09090d4 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 7fd108e23245c500d3c395c32fdd9191b1e374d0..a2873b45fd812eebd8e036e7218d8b3e5db74b89 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 f4a4be6ad2b75b2068260232c95c356de5987ea1..9a377fc903e871e916236df37478ac5bd8b539dd 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 84865bb61ebfd16a05653abffeb0a30c8bd21f38..6bf10805c0c8a279938ee5d301ea886d75f050c2 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 a01f46c137d767aa5fe4cebc1040851d32a91b62..b7d64752788a0a0573ff380d7e6ce05dad32b920 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 c91403e2f05ab895e15d5c2c2bc7466904b8090c..980a4e423efbcb4816551e2c82f43fe469a0e756 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 22ad36da987a40a2bf6561f7c472136c629881eb..df49fd1ff4208dd5cb9d3bc90bbfd2eca9a02363 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 f1e08032790584188f45aa330c988a6940f75e3b..504c61e7ac1f4feefd0546ef4f9ce9a444a1ce13 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 ca245b7046c58c3b61b77b31e0d5c8e24a677b14..aa691cd08ba5fe277b7d3eeda5fb4c286b9d62eb 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 d5bade22a315d5efb7f7982d1ab9de4e2b63f066..65592197fc47ad50ada996e238fdcebfcd1137ae 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 bf9e00fe75bdb27623d773a39e276e7a285151b5..15282107859f6b3b381b2758b273c32f6f2916a5 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 5268306217d3a8086733ad50d5854706c9488b2d..6be561819a1d16c436c584fa26703d813f583b58 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 022f279cff6657c434d37addcc9eafbe10eb998a..a3a1324c0ca0274df3cbcff57cc39ec2d0a6a9a2 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 c2a460fb7fe1468ab9cd49fa44671bfc867155d0..f2cb961e12280cbb8c7210ba7de0aaf23ac68bab 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 fec0f6ce43e97905a18cc092f1080b94a27065f4..76a201fc4564faba0b250215f592c6e7aa4441ab 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 5f923f0da57b19be795587e3b446fe8fe51ac79a..20c38b872fb1c43e5af6f3d488363f9c1a35b784 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 ec3224f1926fe52dfb841d59c7826f38cac7298c..25b0613eae3ec063b25204e57a399dd5fcce35a7 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 a597eb6dc59655769f352af5d8b821d86cbd47e8..bd88efcb3f8e097b2d09e13e81b30480b944283a 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 1285d94f3b5edc9120764c7985935acba0975aa1..7a685f1f347a14310ee60570ebfd723a8bbb7fdf 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 9477a0be36783da930745ca4c076dc09e5aedd1d..4f1c7ee309e771b53792e907db6d7d8b15598598 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 1482de35182ede10a8d5591f7a27c5865fb25118..bb61c1b5a51f36c82e14701fc4f70943f5e32189 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 9e652ad26de676cd73734aba9b0a4e1d64127e6f..4cc5144ebb073e889f14904ba2f4ffd7616ced22 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 a7526a1ab47266db81582d26ffacfebe73e6a3b6..971cce37d6fb68a092117e0164670c60925f24bb 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 01f9f57fed9cbf133a9ee5b367afd6ebdd2b1857..4f612b334af58e27273082bc71053e8b1fe66c52 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 bd1c8bc6fa30b0983ed36a044b28c37f82f9d2c9..1760549feffb9732dcb826863b2d99272fec20ff 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 11b4f9fb53b514526422bc737e620b54d6a65f50..f422118470ed965f35f8904c9433d84dfd090a43 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 5cbcad7ca3a24dee58d4f1a464985acb2f9699f6..4b56ee0a7b4c1121941bee8f54f2af34be0ecf55 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 c294a593b7b138cf852a18a9a6026db0d4aa24e5..9afd8fad01f73f6ea922f972ecd375cba85a400e 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 1598b73ffdea583294f39a3adaca7cd24cc088c3..dfd72d63958fe80612fcfbee5128a6fba7e5c1a7 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 ec1b67f2f6a70668f377058d579761b84d285195..8959951def80b390252084ed00d9589d4a9524cf 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 ed1882a162117139395afdadab659d18dc1abfc5..5b652437d841ca38336011e7f90b02433fdbbaf2 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