diff --git a/data/grid5000/sites/lille/clusters/chti/chti.json b/data/grid5000/sites/lille/clusters/chti/chti.json
deleted file mode 100755
index 1a67caaf444083d370962226f2d4c53d2fa70ae5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/chti.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "created_at": null,
-  "model": "IBM eServer 326m",
-  "type": "cluster",
-  "uid": "chti"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-1.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-1.json
deleted file mode 100755
index 6cda43e36b3dddc1bf3f94d599a4250a948ef581..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-1.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.54",
-      "mac": "00:11:25:c4:50:c0",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-1-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.54",
-      "mac": "00:11:25:c4:50:c1",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-1.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/14",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.54",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-1-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.54",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-1-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-1"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-10.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-10.json
deleted file mode 100755
index 215948de4ffcd1ff4108593bf38a6eae68e7f0e4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-10.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.63",
-      "mac": "00:11:25:c4:49:fe",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-10-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.63",
-      "mac": "00:11:25:c4:49:ff",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-10.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/24",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.63",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-10-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.63",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-10-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-10"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-11.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-11.json
deleted file mode 100755
index a60b8d2ed2d1a83df494f1850d61cc5ee3081cb7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-11.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.64",
-      "mac": "00:11:25:c4:54:40",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-11-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.64",
-      "mac": "00:11:25:c4:54:41",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-11.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/23",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.64",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-11-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.64",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-11-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-11"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-12.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-12.json
deleted file mode 100755
index cf068f3d7928974f3b32da77ebadfde810705568..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-12.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.65",
-      "mac": "00:11:25:c4:50:78",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-12-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.65",
-      "mac": "00:11:25:c4:50:79",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-12.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/25",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.65",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-12-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.65",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-12-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-12"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-13.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-13.json
deleted file mode 100755
index 9e298fa61d26dafb9e46c0da1eeb5f3c07a7f5ba..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-13.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.66",
-      "mac": "00:11:25:c4:53:14",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-13-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.66",
-      "mac": "00:11:25:c4:53:15",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-13.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/26",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.66",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-13-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.66",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-13-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-13"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-14.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-14.json
deleted file mode 100755
index 46c639cf379a31da86279ba602cfee2d83b915d2..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-14.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.67",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-14-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.67",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-14.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/27",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.67",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-14-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.67",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-14-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-14"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-15.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-15.json
deleted file mode 100755
index 629c9361385d5f27b8aba2d35c8370441e60448c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-15.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.68",
-      "mac": "00:11:25:c4:50:a0",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-15-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.68",
-      "mac": "00:11:25:c4:50:a1",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-15.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/28",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.68",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-15-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.68",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-15-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-15"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-16.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-16.json
deleted file mode 100755
index 209e93d1675339f5bba0f322fe1011d0cd0aa1dc..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-16.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.69",
-      "mac": "00:11:25:c4:4e:84",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-16-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.69",
-      "mac": "00:11:25:c4:4e:85",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-16.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/29",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.69",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-16-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.69",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-16-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-16"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-17.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-17.json
deleted file mode 100755
index 91003d125202c4c177ef3b1ffbd7a4dc3a11474d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-17.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.70",
-      "mac": "00:11:25:c4:52:12",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-17-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.70",
-      "mac": "00:11:25:c4:52:13",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-17.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/30",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.70",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-17-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.70",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-17-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-17"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-18.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-18.json
deleted file mode 100755
index 83026b8000d394a10ede36174087dc0b5d20dda5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-18.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.71",
-      "mac": "00:11:25:c4:50:1c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-18-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.71",
-      "mac": "00:11:25:c4:50:1d",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-18.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/31",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.71",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-18-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.71",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-18-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-18"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-19.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-19.json
deleted file mode 100755
index 8191ecd0ee03771f76c91d93e8009ed4f59e1924..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-19.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.72",
-      "mac": "00:11:25:c4:52:0c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-19-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.72",
-      "mac": "00:11:25:c4:52:0d",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-19.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/32",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.72",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-19-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.72",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-19-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-19"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-2.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-2.json
deleted file mode 100755
index e9821987c2ef8b16279dd174bd3feb15fe8c3fec..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-2.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.55",
-      "mac": "00:11:25:c4:54:08",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-2-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.55",
-      "mac": "00:11:25:c4:54:09",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-2.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/15",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.55",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-2-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.55",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-2-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-2"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-20.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-20.json
deleted file mode 100755
index dcc43844aece09e68e40192ffbe6297c18bb3c9a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-20.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.73",
-      "mac": "00:11:25:c4:52:2c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-20-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.73",
-      "mac": "00:11:25:c4:52:2d",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-20.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/33",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.73",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-20-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.73",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-20-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-20"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-3.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-3.json
deleted file mode 100755
index 6a1b669203ebe3f8e92da63b8f32758b48b1fdd1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-3.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.56",
-      "mac": "00:11:25:c4:4f:2a",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-3-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.56",
-      "mac": "00:11:25:c4:4f:2b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-3.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/16",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.56",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-3-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.56",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-3-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-3"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-4.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-4.json
deleted file mode 100755
index 0e8508b64fd4aa1f1b1e1238e636e627060b2f15..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-4.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.57",
-      "mac": "00:11:25:c4:54:2c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-4-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.57",
-      "mac": "00:11:25:c4:54:2d",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-4.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/17",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.57",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-4-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.57",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-4-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-5.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-5.json
deleted file mode 100755
index 3c25eb644f763e7509081700bb7b98dc41197db4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-5.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.58",
-      "mac": "00:11:25:c4:50:10",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-5-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.58",
-      "mac": "00:11:25:c4:50:11",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-5.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/18",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.58",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-5-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.58",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-5-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-5"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-6.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-6.json
deleted file mode 100755
index ca30a96de47839673e52a605a028cb1adc52e4e0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-6.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.59",
-      "mac": "00:11:25:c4:52:7a",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-6-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.59",
-      "mac": "00:11:25:c4:52:7b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-6.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/19",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.59",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-6-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.59",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-6-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-6"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-7.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-7.json
deleted file mode 100755
index c19d4160c6b12fc75c1fab23dcdaf64a13993c7a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-7.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.60",
-      "mac": "00:11:25:c4:50:c6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-7-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.60",
-      "mac": "00:11:25:c4:50:c7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-7.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/20",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.60",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-7-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.60",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-7-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-7"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-8.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-8.json
deleted file mode 100755
index 2a5ff78ed976e4a555659a47571727bd04d92a05..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-8.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.61",
-      "mac": "00:11:25:c4:45:56",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-8-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.61",
-      "mac": "00:11:25:c4:45:57",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-8.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/21",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.61",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-8-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.61",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-8-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-8"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-9.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-9.json
deleted file mode 100755
index 2ab77e4ecb837e258a7a7b9074938b3a7864af24..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-9.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.62",
-      "mac": "00:11:25:c4:51:0e",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-9-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.62",
-      "mac": "00:11:25:c4:51:0f",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-9.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "Gi3/22",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5780"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.62",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chti-9-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    },
-    {
-      "device": "myri0",
-      "driver": "mx",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "192.168.162.62",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chti-9-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
-      "switch": null,
-      "vendor": "Myricom",
-      "version": "10G-PCIE-8A-C"
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "252"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chti-9"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/chuque.json b/data/grid5000/sites/lille/clusters/chuque/chuque.json
deleted file mode 100755
index a99a5ff3a975fd5ced38ef7aad9eb39dbabebaf2..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/chuque.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "created_at": null,
-  "model": "IBM eServer 326",
-  "type": "cluster",
-  "uid": "chuque"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-1.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-1.json
deleted file mode 100755
index d007cb35a7d0e81648607d5d8674c624113a8960..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-1.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.1",
-      "mac": "00:11:25:1e:28:b8",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-1-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.1",
-      "mac": "00:11:25:1e:28:b9",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-1.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.1",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-1-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-1"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-10.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-10.json
deleted file mode 100755
index b8b133425a9c8018fbcf8ff32ab4b85cad0adb1e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-10.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.10",
-      "mac": "00:11:25:1e:28:a2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-10-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.10",
-      "mac": "00:11:25:1e:28:a3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-10.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.10",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-10-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-10"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-11.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-11.json
deleted file mode 100755
index bd46709d451b6b8fb8b83c4c35e7c125c0db675a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-11.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.11",
-      "mac": "00:11:25:1e:28:52",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-11-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.11",
-      "mac": "00:11:25:1e:28:53",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-11.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.11",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-11-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-11"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-12.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-12.json
deleted file mode 100755
index 1839c3020a1b2663c86cf2cfe10ae587df976c87..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-12.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.12",
-      "mac": "00:11:25:1e:28:b2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-12-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.12",
-      "mac": "00:11:25:1e:28:b3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-12.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.12",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-12-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-12"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-13.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-13.json
deleted file mode 100755
index 55bed9a16f56d9042237f8023ea3f5ae8a2136e4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-13.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.13",
-      "mac": "00:11:25:1e:28:ac",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-13-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.13",
-      "mac": "00:11:25:1e:28:ad",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-13.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.13",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-13-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-13"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-14.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-14.json
deleted file mode 100755
index 90b379667e51f7107c4b6aedb654d0cdc3da3de6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-14.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.14",
-      "mac": "00:11:25:1e:28:46",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-14-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.14",
-      "mac": "00:11:25:1e:28:47",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-14.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.14",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-14-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-14"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-15.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-15.json
deleted file mode 100755
index 8e251919f2e82b3a39a3144635852dea9b6b0ed8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-15.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.15",
-      "mac": "00:11:25:1e:28:c4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-15-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.15",
-      "mac": "00:11:25:1e:28:c5",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-15.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.15",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-15-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-15"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-16.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-16.json
deleted file mode 100755
index 56edd5852826d7399d1512d9c2b465fbe0e2d9b5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-16.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.16",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-16-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.16",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-16.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.16",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-16-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-16"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-17.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-17.json
deleted file mode 100755
index bbfced619a0082ee025d154842392b6089b783af..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-17.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.17",
-      "mac": "00:11:25:1e:28:c8",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-17-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.17",
-      "mac": "00:11:25:1e:28:c9",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-17.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.17",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-17-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-17"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-18.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-18.json
deleted file mode 100755
index c00ba33d60f09c143f2b348d9b5e59f736a2d858..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-18.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.18",
-      "mac": "00:11:25:1e:28:a0",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-18-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.18",
-      "mac": "00:11:25:1e:28:a1",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-18.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.18",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-18-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-18"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-19.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-19.json
deleted file mode 100755
index b3336d1d7d06550d38ace86da51501185fe6c31c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-19.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.19",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-19-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.19",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-19.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.19",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-19-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-19"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-2.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-2.json
deleted file mode 100755
index 1ee50c600b0874a6381760f38ab8c614ad13ef11..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-2.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.2",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-2-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.2",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-2.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.2",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-2-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-2"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-20.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-20.json
deleted file mode 100755
index 7df14ae5e8dfdf28fade511a445488032df81350..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-20.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.20",
-      "mac": "00:11:25:1e:2a:56",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-20-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.20",
-      "mac": "00:11:25:1e:2a:57",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-20.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.20",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-20-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-20"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-21.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-21.json
deleted file mode 100755
index 67ab1c90daad99d33392e50ed3c6f488e54d5920..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-21.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.21",
-      "mac": "00:11:25:1e:29:b2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-21-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.21",
-      "mac": "00:11:25:1e:29:b3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-21.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.21",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-21-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-21"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-22.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-22.json
deleted file mode 100755
index 371ec82cb5f4a6ac016b2726c8f2f7ae11112838..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-22.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.22",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-22-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.22",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-22.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.22",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-22-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-22"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-23.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-23.json
deleted file mode 100755
index b6b0e22220c7189bfcb73bb45317c1478f7b283b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-23.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.23",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-23-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.23",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-23.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.23",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-23-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-23"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-24.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-24.json
deleted file mode 100755
index 6352a806d55c0ca367bb3f24f5dc0c234c4778ae..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-24.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.24",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-24-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.24",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-24.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.24",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-24-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-24"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-25.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-25.json
deleted file mode 100755
index 59d0845b05b9aa0c69c5a4676b48f60c84b15f45..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-25.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.25",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-25-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.25",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-25.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.25",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-25-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-25"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-26.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-26.json
deleted file mode 100755
index 72e7cdc6433c844d73cc0b99964df5bcb1ffaf7e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-26.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.26",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-26-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.26",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-26.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.26",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-26-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-26"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-27.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-27.json
deleted file mode 100755
index 9e8c2aa3f3911c2a3ad3dca40a690ed6b415db40..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-27.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.27",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-27-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.27",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-27.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.27",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-27-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-27"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-28.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-28.json
deleted file mode 100755
index 262356625169c175633bd19c63222908068bb1b3..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-28.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.28",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-28-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.28",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-28.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.28",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-28-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-28"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-29.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-29.json
deleted file mode 100755
index 036a2c998d99c7c4f1fa67f7d3feb9a4959e59f0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-29.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.29",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-29-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.29",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-29.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.29",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-29-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-29"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-3.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-3.json
deleted file mode 100755
index b2cf938c6e9b434f192fa8da1258ff6aa305354f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-3.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.3",
-      "mac": "00:11:25:1e:28:3c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-3-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.3",
-      "mac": "00:11:25:1e:28:3d",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-3.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.3",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-3-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-3"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-30.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-30.json
deleted file mode 100755
index e6a11ac7124167badba4564dabacd4a00db44d16..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-30.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.30",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-30-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.30",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-30.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.30",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-30-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-30"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-31.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-31.json
deleted file mode 100755
index acbfc432205ceb43506b6c438d222ff03112c63a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-31.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.31",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-31-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.31",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-31.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.31",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-31-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-31"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-32.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-32.json
deleted file mode 100755
index c65aacd54e91aab5dfe67e125db5879a2d45bfb2..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-32.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.32",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-32-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.32",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-32.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.32",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-32-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-32"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-33.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-33.json
deleted file mode 100755
index baba6ace874e773233e88d81a1bc8f9030227020..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-33.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.33",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-33-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.33",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-33.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.33",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-33-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-33"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-34.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-34.json
deleted file mode 100755
index 685825a0319e956d0d722ef679b0a47727dcd753..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-34.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.34",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-34-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.34",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-34.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.34",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-34-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-34"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-35.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-35.json
deleted file mode 100755
index 1393d4a8321699e38bac71fd4c85ddd07600f9b1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-35.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.35",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-35-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.35",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-35.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.35",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-35-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-35"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-36.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-36.json
deleted file mode 100755
index b7e1692b26e5a438bd46bfbb40ca1b56cc5de9b5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-36.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.36",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-36-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.36",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-36.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.36",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-36-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-36"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-37.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-37.json
deleted file mode 100755
index 9f8b4653c7bd9b3186eef282f46a8409f041f309..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-37.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.37",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-37-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.37",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-37.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.37",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-37-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-37"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-38.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-38.json
deleted file mode 100755
index 8710e7c47787e825b3dce0a778d9723f905281c0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-38.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.38",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-38-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.38",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-38.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.38",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-38-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-38"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-39.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-39.json
deleted file mode 100755
index 06db9834070e75326210b4d95adccb15dfa30567..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-39.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.39",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-39-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.39",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-39.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.39",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-39-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-39"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-4.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-4.json
deleted file mode 100755
index 7ce8e34687097ab66b8c034fa10de663951a7192..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-4.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.4",
-      "mac": "00:11:25:1e:29:92",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-4-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.4",
-      "mac": "00:11:25:1e:29:93",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-4.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.4",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-4-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-40.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-40.json
deleted file mode 100755
index 46463dbafbb64aef0b75daba9fbc0139b3ce7140..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-40.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.40",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-40-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.40",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-40.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.40",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-40-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-40"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-41.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-41.json
deleted file mode 100755
index 72063ea2abff8edf7c29c5769ab5afedaf6431ad..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-41.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.41",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-41-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.41",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-41.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.41",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-41-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-41"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-42.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-42.json
deleted file mode 100755
index 37cc24fce251fb806ba30800311930ec1a26ebf1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-42.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.42",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-42-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.42",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-42.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.42",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-42-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-42"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-43.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-43.json
deleted file mode 100755
index 8966cfaf92448059ca1a4aff5c3b413d9fc8d576..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-43.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.43",
-      "mac": "00:11:25:1e:2a:4c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-43-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.43",
-      "mac": "00:11:25:1e:2a:4d",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-43.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.43",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-43-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-43"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-44.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-44.json
deleted file mode 100755
index daa0b327a3af9b0bf9d4ac6c6c96e32a12a1d82c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-44.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.44",
-      "mac": "00:11:25:1e:29:80",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-44-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.44",
-      "mac": "00:11:25:1e:29:81",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-44.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.44",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-44-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-44"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-45.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-45.json
deleted file mode 100755
index 352c4b3a05163a4e11c64d1170ccd39013d4e83d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-45.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.45",
-      "mac": "00:11:25:1e:29:a0",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-45-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.45",
-      "mac": "00:11:25:1e:29:a1",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-45.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.45",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-45-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-45"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-46.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-46.json
deleted file mode 100755
index bc42530ef4d8b8f4e4d0d63811a26e7dec9087d0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-46.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.46",
-      "mac": "00:11:25:1e:29:94",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-46-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.46",
-      "mac": "00:11:25:1e:29:95",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-46.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.46",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-46-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-46"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-47.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-47.json
deleted file mode 100755
index a8f0fdd44170a30190a17929706e6535dcc94bcd..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-47.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.47",
-      "mac": "00:11:25:1e:29:aa",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-47-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.47",
-      "mac": "00:11:25:1e:29:ab",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-47.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.47",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-47-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-47"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-48.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-48.json
deleted file mode 100755
index 1622ef0361448928f8b6d47181ceff1c77a9c8ce..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-48.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.48",
-      "mac": "00:11:25:1e:29:82",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-48-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.48",
-      "mac": "00:11:25:1e:29:83",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-48.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.48",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-48-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-48"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-49.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-49.json
deleted file mode 100755
index 0008062fa1e965d437066576262ef4dad00064b0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-49.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.49",
-      "mac": "00:11:25:1e:28:b6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-49-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.49",
-      "mac": "00:11:25:1e:28:b7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-49.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.49",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-49-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-49"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-5.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-5.json
deleted file mode 100755
index b5002ccd60e29f0c8874d0bd060f6a040205962f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-5.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.5",
-      "mac": "00:11:25:1e:28:8c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-5-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.5",
-      "mac": "00:11:25:1e:28:8d",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-5.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.5",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-5-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-5"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-50.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-50.json
deleted file mode 100755
index ca2b9156aa2e0e59e912dfe635ba430931cd7ab0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-50.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.50",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-50-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.50",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-50.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.50",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-50-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-50"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-51.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-51.json
deleted file mode 100755
index ee92adac652814289f9084d7725ea0b0e34ccb58..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-51.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.51",
-      "mac": "00:11:25:1e:2a:68",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-51-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.51",
-      "mac": "00:11:25:1e:2a:69",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-51.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.51",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-51-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-51"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-52.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-52.json
deleted file mode 100755
index 122b3fe94f9dabcc88ae590af75da1aa4d49527c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-52.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.52",
-      "mac": "00:11:25:1e:29:a4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-52-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.52",
-      "mac": "00:11:25:1e:29:a5",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-52.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.52",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-52-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-52"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-53.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-53.json
deleted file mode 100755
index f4afef9235ebe3a39dc0bfe0113fb1d71917630d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-53.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.53",
-      "mac": "00:11:25:1e:2a:60",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-53-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.53",
-      "mac": "00:11:25:1e:2a:61",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-53.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.53",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-53-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-53"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-6.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-6.json
deleted file mode 100755
index d588b582055ed6b681caba059304364fe550cd23..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-6.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.6",
-      "mac": "00:11:25:1e:28:96",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-6-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.6",
-      "mac": "00:11:25:1e:28:97",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-6.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.6",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-6-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-6"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-7.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-7.json
deleted file mode 100755
index 95a7fbd05c93af723b9974107bc0813f86eee69b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-7.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.7",
-      "mac": "00:11:25:1e:28:42",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-7-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.7",
-      "mac": "00:11:25:1e:28:43",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-7.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.7",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-7-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-7"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-8.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-8.json
deleted file mode 100755
index df9e26bc7df924ac2dd212b707013109e3db8522..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-8.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.8",
-      "mac": "00:11:25:1e:28:9c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-8-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.8",
-      "mac": "00:11:25:1e:28:9d",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-8.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.8",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-8-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-8"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-9.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-9.json
deleted file mode 100755
index ee2e1ab32a0f518aa5cdda48ed5706c1f9cf939f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-9.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "main_memory": {
-    "ram_size": 4294967296,
-    "virtual_size": null
-  },
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.160.9",
-      "mac": "00:11:25:1e:28:0e",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-9-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.9",
-      "mac": "00:11:25:1e:28:0f",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "chuque-9.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": "Broadcom",
-      "version": "NetXtreme BCM5704"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.158.9",
-      "mac": "00:19:A9:9F:48:C0",
-      "management": true,
-      "mountable": false,
-      "network_address": "chuque-9-rsa.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "vendor": null,
-      "version": null
-    }
-  ],
-  "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 1048576,
-    "clock_speed": 2200000000.0,
-    "instruction_set": "",
-    "model": "AMD Opteron",
-    "other_description": "",
-    "vendor": "AMD",
-    "version": "248"
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_sil",
-      "interface": "SATA",
-      "size": 74505805969.2383
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "chuque-9"
-}
\ No newline at end of file
diff --git a/generators/input/lille.rb b/generators/input/lille.rb
index 9163f77a065679ce00f5a691244e94b38451f2d1..c78fefc88b656cba91055161235e6ba86b40cfc0 100755
--- a/generators/input/lille.rb
+++ b/generators/input/lille.rb
@@ -13,186 +13,6 @@ site :lille do |site_uid|
     %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-xen-1.0 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
     %w{lenny-x64-base-2.3 lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-xen-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
   
-  cluster :chuque do |cluster_uid|
-    model "IBM eServer 326"
-    created_at nil
-    53.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-        supported_job_types({:deploy => true, :besteffort => true, :virtual => false})
-        architecture({
-          :smp_size => 2, 
-          :smt_size => 2,
-          :platform_type => "x86_64"
-          })
-        processor({
-          :vendor => "AMD",
-          :model => "AMD Opteron",
-          :version => "248",
-          :clock_speed => 2.2.G,
-          :instruction_set => "",
-          :other_description => "",
-          :cache_l1 => nil,
-          :cache_l1i => nil,
-          :cache_l1d => nil,
-          :cache_l2 => 1.MiB
-        })
-        main_memory({
-          :ram_size => 4.GiB,
-          :virtual_size => nil
-        })
-        operating_system({
-          :name => nil,
-          :release => nil,
-          :version => nil
-        })
-        storage_devices [
-          {:interface => 'SATA', :size => 80.GB, :driver => "sata_sil"}
-          ]
-        network_adapters [{
-            :interface => 'Ethernet',
-            :rate => 1.G,
-            :mac => lookup('lille',"#{node_uid}", 'mac_eth0'),
-            :vendor => 'Broadcom',
-            :version => 'NetXtreme BCM5704',
-            :enabled => true,
-            :management => false,
-            :mountable => true,
-            :driver => 'tg3',
-            :mounted => true,
-            :device => "eth0",
-            :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
-            :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
-            :switch => "gw"
-          },{
-            :interface => 'Ethernet',
-            :rate => 1.G,
-            :mac => lookup('lille',"#{node_uid}", 'mac_eth1'),
-            :vendor => 'Broadcom',
-            :version => 'NetXtreme BCM5704',
-            :enabled => true,
-            :management => false,
-            :mountable => true,
-            :mounted => true,
-            :device => "eth1",
-            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-            :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-            :driver => "tg3",
-            :switch => "gw"
-          },{
-            :interface => 'Ethernet',
-            :rate => 1.G,
-            :mac => lookup('lille',"#{node_uid}", 'mac_mgt'),
-            :vendor => nil,
-            :version => nil,
-            :enabled => true,
-            :management => true,
-            :mountable => false,
-            :network_address => "#{node_uid}-rsa.#{site_uid}.grid5000.fr",
-            :ip => dns_lookup("#{node_uid}-rsa.#{site_uid}.grid5000.fr"),
-            :switch => "gw"
-          }]  
-      end
-    end
-  end # cluster chuque
-  cluster :chti do |cluster_uid|
-    model "IBM eServer 326m"
-    created_at nil
-    
-    20.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-        supported_job_types({:deploy => true, :besteffort => true, :virtual => false})
-        architecture({
-          :smp_size => 2, 
-          :smt_size => 2,
-          :platform_type => "x86_64"
-          })
-        processor({
-          :vendor => "AMD",
-          :model => "AMD Opteron",
-          :version => "252",
-          :clock_speed => 2.6.G,
-          :instruction_set => "",
-          :other_description => "",
-          :cache_l1 => nil,
-          :cache_l1i => nil,
-          :cache_l1d => nil,
-          :cache_l2 => 1.MiB
-        })
-        main_memory({
-          :ram_size => 4.GiB, # bytes
-          :virtual_size => nil
-        })
-        operating_system({
-          :name => nil,
-          :release => nil,
-          :version => nil
-        })
-        storage_devices [
-          {:interface => 'SATA', :size => 80.GB, :driver => "sata_svw"}
-          ]
-        network_adapters [{
-            :interface => 'Ethernet',
-            :rate => 1.G,
-            :mac => lookup('lille',"#{node_uid}", 'mac_eth0'),
-            :vendor => 'Broadcom',
-            :version => 'NetXtreme BCM5780',
-            :enabled => true,
-            :management => false, 
-            :mountable => true,
-            :driver => 'tg3',
-            :mounted => true,
-            :device => 'eth0',
-            :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
-            :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
-            :switch => 'gw'
-          },{
-            :interface => 'Ethernet',
-            :rate => 1.G,
-            :mac => lookup('lille',"#{node_uid}", 'mac_eth1'),
-            :vendor => 'Broadcom',
-            :version => 'NetXtreme BCM5780',
-            :enabled => true,
-            :management => false, 
-            :mountable => true,
-            :driver => 'tg3',
-            :mounted => true,
-            :device => 'eth1',
-            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-            :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-            :switch => "gw",
-            :switch_port => lookup('lille', "#{node_uid}", 'switch_port')
-          },{
-            :interface => 'Ethernet', 
-            :rate => 1.G,
-            :mac => lookup('lille',"#{node_uid}", 'mac_mgt'),
-            :vendor => nil,
-            :version => nil,
-            :enabled => true,
-            :management => true,
-            :mountable => false,
-            :network_address => "#{node_uid}-rsa.#{site_uid}.grid5000.fr",
-            :ip => dns_lookup("#{node_uid}-rsa.#{site_uid}.grid5000.fr"),
-            :switch => 'gw'
-          },{
-            :interface => 'Myrinet',
-            :rate => 10.G,
-            :mac => nil,
-            :vendor => "Myricom",
-            :version => "10G-PCIE-8A-C",
-            :enabled => true,
-            :management => false,
-            :mountable => true,
-            :driver => 'mx',
-            :mounted => true, 
-            :device => 'myri0',
-            :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
-            :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
-            :switch => nil
-          }]
-      end
-    end
-  end # cluster chti   
-  
   cluster :chicon do |cluster_uid|
     model "IBM eServer 326m"
     created_at nil