diff --git a/data/grid5000/network_equipments/renater-bordeaux.json b/data/grid5000/network_equipments/renater-bordeaux.json
deleted file mode 100644
index 9d261c2450812ea1444dc95e35e439baf8189ea1..0000000000000000000000000000000000000000
--- a/data/grid5000/network_equipments/renater-bordeaux.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "kind": "virtual",
-  "linecards": [
-    {
-      "rate": 10000000000,
-      "ports": [
-        {
-          "uid": "renater-lyon"
-        },
-        {
-          "kind": "router",
-          "site_uid": "bordeaux",
-          "uid": "gw-bordeaux"
-        }
-      ]
-    }
-  ],
-  "type": "network_equipment",
-  "uid": "renater-bordeaux"
-}
diff --git a/data/grid5000/network_equipments/renater-lyon.json b/data/grid5000/network_equipments/renater-lyon.json
index 13b6739009daab1b73d4a18128da2faceb1d237d..9df2c84738633567d7238f84395884f442fe3c32 100644
--- a/data/grid5000/network_equipments/renater-lyon.json
+++ b/data/grid5000/network_equipments/renater-lyon.json
@@ -10,9 +10,6 @@
         {
           "uid": "renater-marseille"
         },
-        {
-          "uid": "renater-bordeaux"
-        },
         {
           "uid": "renater-grenoble"
         },
diff --git a/data/grid5000/sites/bordeaux/bordeaux.json b/data/grid5000/sites/bordeaux/bordeaux.json
deleted file mode 100755
index 3d9f3ff2285b5bf7c584b5928fb31006a5ab1b30..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/bordeaux.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "compilation_server": false,
-  "description": "Grid5000 Bordeaux site",
-  "email_contact": "support-staff@lists.grid5000.fr",
-  "kavlan_ip_range": "10.0.0.0/14",
-  "latitude": 44.833333,
-  "location": "Bordeaux, France",
-  "longitude": -0.566667,
-  "name": "Bordeaux",
-  "security_contact": "support-staff@lists.grid5000.fr",
-  "sys_admin_contact": "support-staff@lists.grid5000.fr",
-  "type": "site",
-  "uid": "bordeaux",
-  "user_support_contact": "support-staff@lists.grid5000.fr",
-  "virt_ip_plage": "10.128.0.0/14",
-  "web": "http://www.grid5000.fr/mediawiki/index.php/Bordeaux:Home"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/bordeplage.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/bordeplage.json
deleted file mode 100755
index 36e28735e130fb04a9c8d5227362856997940549..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/bordeplage.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "created_at": null,
-  "kavlan": false,
-  "model": "Dell PowerEdge 1855",
-  "type": "cluster",
-  "uid": "bordeplage"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
deleted file mode 100755
index cd8bd3c204d46aeec94fb9f4c4b3419228ea050b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "6PFGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.1",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:d9:ec",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.1",
-      "mac": "00:14:22:0c:d9:ed",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-1-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:9d:56",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.1",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-1-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:9d:57",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.1",
-      "mac": "00:14:22:0c:d9:ec",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-1-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-1"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
deleted file mode 100755
index 57371966c7cf931200aaf23deb80434a32b66e33..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "725GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.10",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-10.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.10",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-10-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:76",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.10",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-10-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:77",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.10",
-      "mac": "00:14:22:0c:da:76",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-10-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-10"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
deleted file mode 100755
index dc8b9cbf03c67e5755afbe19ff9cf0e695f3055c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "05/12/2005",
-    "vendor": "Dell Computer Corporation",
-    "version": "A03"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "FC5GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.11",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:d9:bc",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-11.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.11",
-      "mac": "00:14:22:0c:d9:bd",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-11-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:2a",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.11",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-11-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:2b",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.11",
-      "mac": "00:14:22:0c:d9:bc",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-11-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-11"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
deleted file mode 100755
index ee713e307f7cb178df920472331829908f5bb9a2..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "05/12/2005",
-    "vendor": "Dell Computer Corporation",
-    "version": "A03"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "2D5GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2110054400,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.12",
-      "ip6": "fe80::214:22ff:fe0c:da74",
-      "mac": "00:14:22:0c:da:74",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-12.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.12",
-      "mac": "00:14:22:0c:da:75",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-12-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3e",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.12",
-      "ip6": "fe80::205:ad00:1:5a3e",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-12-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3f",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.12",
-      "mac": "00:14:22:0c:da:74",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-12-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-12"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
deleted file mode 100755
index f1444a73aa48a7ab3122de817f7f364cdb50882e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "725GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.13",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:da:82",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-13.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.13",
-      "mac": "00:14:22:0c:da:83",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-13-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:7b",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.13",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-13-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:7c",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.13",
-      "mac": "00:14:22:0c:da:82",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-13-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-13"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
deleted file mode 100755
index b5c01cb135136a3e0fdad7f522733c80f6402582..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "HC5GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.14",
-      "ip6": "fe80::214:22ff:fe0c:da90",
-      "mac": "00:14:22:0c:da:90",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-14.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.14",
-      "mac": "00:14:22:0c:da:91",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-14-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:52",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.14",
-      "ip6": "fe80::205:ad00:1:5a52",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-14-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:53",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.14",
-      "mac": "00:14:22:0c:da:90",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-14-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-14"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
deleted file mode 100755
index 366c8734251db88141a507f922d2eb6322aad08c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "2PFGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.15",
-      "ip6": "fe80::214:22ff:fe0c:dac0",
-      "mac": "00:14:22:0c:da:c0",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-15.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.15",
-      "mac": "00:14:22:0c:da:c1",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-15-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:41",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.15",
-      "ip6": "fe80::205:ad00:1:6241",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-15-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:42",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.15",
-      "mac": "00:14:22:0c:da:c0",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-15-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-15"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
deleted file mode 100755
index 326206dd2c7d07d832b8948e4868e47e210f4c41..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "725GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.16",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:da:44",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-16.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.16",
-      "mac": "00:14:22:0c:da:45",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-16-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:74",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.16",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-16-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:75",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.16",
-      "mac": "00:14:22:0c:da:44",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-16-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-16"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
deleted file mode 100755
index 5ab70243a2d551c3dcdbbbaf15d06ea70bfa7532..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "725GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.17",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:da:62",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-17.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.17",
-      "mac": "00:14:22:0c:da:63",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-17-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:c5",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.17",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-17-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:c6",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.17",
-      "mac": "00:14:22:0c:da:62",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-17-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-17"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
deleted file mode 100755
index fb9056d1ad24e616e11dd4d216750caf21aa8dde..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "05/12/2005",
-    "vendor": "Dell Computer Corporation",
-    "version": "A03"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "335GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.18",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:da:a2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-18.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.18",
-      "mac": "00:14:22:0c:da:a3",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-18-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:09",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.18",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-18-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:0a",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.18",
-      "mac": "00:14:22:0c:da:a2",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-18-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-18"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
deleted file mode 100755
index 6c16bb93e0ea8d463ca9e7fdec558b2aa5ae6658..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "05/12/2005",
-    "vendor": "Dell Computer Corporation",
-    "version": "A03"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "B35GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2110054400,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.19",
-      "ip6": "fe80::214:22ff:fe0c:b400",
-      "mac": "00:14:22:0c:b4:00",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-19.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.19",
-      "mac": "00:14:22:0c:b4:01",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-19-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b5",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.19",
-      "ip6": "fe80::205:ad00:1:62b5",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-19-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b6",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.19",
-      "mac": "00:14:22:0c:b4:00",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-19-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-19"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
deleted file mode 100755
index a0dcd22560181284ba633777be9cdeb2ff3be31b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "725GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.2",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:da:46",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-2.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.2",
-      "mac": "00:14:22:0c:da:47",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-2-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:25",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.2",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-2-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:26",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.2",
-      "mac": "00:14:22:0c:da:46",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-2-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-2"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
deleted file mode 100755
index d9eb206884260442f5a1b510c3fb9914265a9a06..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "05/12/2005",
-    "vendor": "Dell Computer Corporation",
-    "version": "A03"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "331KV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2110054400,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.20",
-      "ip6": "fe80::214:22ff:fe0c:b31c",
-      "mac": "00:14:22:0c:b3:1c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-20.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.20",
-      "mac": "00:14:22:0c:b3:1d",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-20-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b9",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.20",
-      "ip6": "fe80::205:ad00:1:62b9",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-20-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:ba",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.20",
-      "mac": "00:14:22:0c:b3:1c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-20-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-20"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
deleted file mode 100755
index 40d0b8365b4ac487e84e59996538fa8342141f82..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "05/12/2005",
-    "vendor": "Dell Computer Corporation",
-    "version": "A03"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "DKMGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2110054400,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.21",
-      "ip6": "fe80::214:22ff:fe0c:e148",
-      "mac": "00:14:22:0c:e1:48",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-21.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.21",
-      "mac": "00:14:22:0c:e1:49",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-21-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:1a",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.21",
-      "ip6": "fe80::205:ad00:1:5a1a",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-21-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:1b",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.21",
-      "mac": "00:14:22:0c:e1:48",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-21-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-21"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
deleted file mode 100755
index cd53cd35eed7418ca6f86b11113ecb81bede31af..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "05/12/2005",
-    "vendor": "Dell Computer Corporation",
-    "version": "A03"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "JMZGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2110054400,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.22",
-      "ip6": "fe80::214:22ff:fe0c:dd02",
-      "mac": "00:14:22:0c:dd:02",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-22.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.22",
-      "mac": "00:14:22:0c:dd:03",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-22-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:42",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.22",
-      "ip6": "fe80::205:ad00:1:5a42",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-22-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:43",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.22",
-      "mac": "00:14:22:0c:dd:02",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-22-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-22"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
deleted file mode 100755
index edf7fcbc9bb2a25c57789d0b936b98d9fcfb0e1a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "725GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.23",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:e1:4c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-23.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.23",
-      "mac": "00:14:22:0c:e1:4d",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-23-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:89",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.23",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-23-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:8a",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.23",
-      "mac": "00:14:22:0c:e1:4c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-23-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-23"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
deleted file mode 100755
index 1d18f99565ca893ca1c69881956ee5d18d96e37f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "05/12/2005",
-    "vendor": "Dell Computer Corporation",
-    "version": "A03"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "1NZGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2110054400,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.24",
-      "ip6": "fe80::214:22ff:fe0c:e0e0",
-      "mac": "00:14:22:0c:e0:e0",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-24.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.24",
-      "mac": "00:14:22:0c:e0:e1",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-24-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ed",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.24",
-      "ip6": "fe80::205:ad00:1:61ed",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-24-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ee",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.24",
-      "mac": "00:14:22:0c:e0:e0",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-24-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-24"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
deleted file mode 100755
index 11f540ec0eb3fad7904c03339308f9e19c405b03..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "05/12/2005",
-    "vendor": "Dell Computer Corporation",
-    "version": "A03"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "9LZGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2110054400,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.25",
-      "ip6": "fe80::214:22ff:fe0c:e176",
-      "mac": "00:14:22:0c:e1:76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-25.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.25",
-      "mac": "00:14:22:0c:e1:77",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-25-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a4:4b",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.25",
-      "ip6": "fe80::205:ad00:2:a44b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-25-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a4:4c",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.25",
-      "mac": "00:14:22:0c:e1:76",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-25-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-25"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
deleted file mode 100755
index 06060a6529fb553f9610a822461d41a39d4896cf..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "05/12/2005",
-    "vendor": "Dell Computer Corporation",
-    "version": "A03"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "3MZGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2110054400,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.26",
-      "ip6": "fe80::214:22ff:fe0c:e152",
-      "mac": "00:14:22:0c:e1:52",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-26.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.26",
-      "mac": "00:14:22:0c:e1:53",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-26-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:95",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.26",
-      "ip6": "fe80::205:ad00:1:6295",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-26-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:96",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.26",
-      "mac": "00:14:22:0c:e1:52",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-26-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-26"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
deleted file mode 100755
index 66f9bd80926de90e1311199ac5f5a403a29dd801..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "725GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.27",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:e1:7e",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-27.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.27",
-      "mac": "00:14:22:0c:e1:7f",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-27-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:56",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.27",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-27-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:57",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.27",
-      "mac": "00:14:22:0c:e1:7e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-27-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-27"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
deleted file mode 100755
index 3bdf6b3c1783af1fa294d3d5b8f3efb8fd83c4e0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "05/12/2005",
-    "vendor": "Dell Computer Corporation",
-    "version": "A03"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "BMZGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2110054400,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.28",
-      "ip6": "fe80::214:22ff:fe0c:e18c",
-      "mac": "00:14:22:0c:e1:8c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-28.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.28",
-      "mac": "00:14:22:0c:e1:8d",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-28-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:99",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.28",
-      "ip6": "fe80::205:ad00:1:6299",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-28-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:9a",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.28",
-      "mac": "00:14:22:0c:e1:8c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-28-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-28"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
deleted file mode 100755
index 76029e01557db2a7e14220722723b2fe8706fb70..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "725GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.29",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:e1:0a",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-29.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.29",
-      "mac": "00:14:22:0c:e1:0b",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-29-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3a",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.29",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-29-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3b",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.29",
-      "mac": "00:14:22:0c:e1:0a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-29-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-29"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
deleted file mode 100755
index 051f9141264fbf1ea66441dfa279315bc674747d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "9KMGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.3",
-      "ip6": "fe80::214:22ff:fe0c:e166",
-      "mac": "00:14:22:0c:e1:66",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-3.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.3",
-      "mac": "00:14:22:0c:e1:67",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-3-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:72",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.3",
-      "ip6": "fe80::205:ad00:2:b472",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-3-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:73",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.3",
-      "mac": "00:14:22:0c:e1:66",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-3-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-3"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
deleted file mode 100755
index de8a3f6f3acd40eca30eeebea99a64cb9575349c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "GMZGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.30",
-      "ip6": "fe80::214:22ff:fe0c:e192",
-      "mac": "00:14:22:0c:e1:92",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-30.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.30",
-      "mac": "00:14:22:0c:e1:93",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-30-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:fd",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.30",
-      "ip6": "fe80::205:ad00:1:61fd",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-30-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:fe",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.30",
-      "mac": "00:14:22:0c:e1:92",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-30-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-30"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
deleted file mode 100755
index 3fd6e59df80271d5cac15cf60031ac0835e31aff..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "725GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.31",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:e1:ba",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-31.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.31",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-31-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:76",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.31",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-31-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:77",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.31",
-      "mac": "00:14:22:0c:e1:ba",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-31-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-31"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
deleted file mode 100755
index 60f007193f3fbe2a1e7e232af10cd1ab33ba5588..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "635GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.32",
-      "ip6": "fe80::214:22ff:fe0c:dab6",
-      "mac": "00:14:22:0c:da:b6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-32.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.32",
-      "mac": "00:14:22:0c:da:b7",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-32-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:98",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.32",
-      "ip6": "fe80::205:ad00:2:a598",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-32-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:99",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.32",
-      "mac": "00:14:22:0c:da:b6",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-32-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-32"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
deleted file mode 100755
index 54a2a8bff970782160282b952d591c056a1a9574..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "725GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.33",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:da:94",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-33.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.33",
-      "mac": "00:14:22:0c:da:95",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-33-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:76",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.33",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-33-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:77",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.33",
-      "mac": "00:14:22:0c:da:94",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-33-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-33"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
deleted file mode 100755
index 40b1a81ce287b01377a01dbd3d76d88a37cd4e8d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "F25GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.34",
-      "ip6": "fe80::214:22ff:fe0c:da12",
-      "mac": "00:14:22:0c:da:12",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-34.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.34",
-      "mac": "00:14:22:0c:da:13",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-34-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:69",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.34",
-      "ip6": "fe80::205:ad00:1:6269",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-34-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:6a",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.34",
-      "mac": "00:14:22:0c:da:12",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-34-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-34"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
deleted file mode 100755
index 576913cc9907d92c7c27db19fe3bc09e6689647a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "BKMGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.35",
-      "ip6": "fe80::214:22ff:fe0c:e136",
-      "mac": "00:14:22:0c:e1:36",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-35.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.35",
-      "mac": "00:14:22:0c:e1:37",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-35-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:37",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.35",
-      "ip6": "fe80::205:ad00:2:b637",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-35-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:38",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.35",
-      "mac": "00:14:22:0c:e1:36",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-35-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-35"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
deleted file mode 100755
index f77b662f6196cba32db9098d2cc7d21ecb39139d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "05/12/2005",
-    "vendor": "Dell Computer Corporation",
-    "version": "A03"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "6KMGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.36",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:e1:6a",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-36.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.36",
-      "mac": "00:14:22:0c:e1:6b",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-36-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:22",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.36",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-36-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:23",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.36",
-      "mac": "00:14:22:0c:e1:6a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-36-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-36"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
deleted file mode 100755
index 4f39510343a8d48f81bdc554559032788324bd02..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "H25GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.37",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:b1:7a",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-37.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.37",
-      "mac": "00:14:22:0c:b1:7b",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-37-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:f1",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.37",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-37-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:f2",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.37",
-      "mac": "00:14:22:0c:b1:7a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-37-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-37"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
deleted file mode 100755
index a0ee5e3effd76b59b2b7ec1a3dd3a79e023952df..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "FWRJZ91"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.38",
-      "ip6": "fe80::213:72ff:fe69:a8b6",
-      "mac": "00:13:72:69:a8:b6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-38.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.38",
-      "mac": "00:13:72:69:a8:b7",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-38-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e1",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.38",
-      "ip6": "fe80::205:ad00:1:61e1",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-38-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e2",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.38",
-      "mac": "00:13:72:69:a8:b6",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-38-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-38"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
deleted file mode 100755
index c4a5d5bc625e90267f96b9c9c5d25a9b6fdddda6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "CD5GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.39",
-      "ip6": "fe80::214:22ff:fe0c:da7c",
-      "mac": "00:14:22:0c:da:7c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-39.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.39",
-      "mac": "00:14:22:0c:da:7d",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-39-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:05",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.39",
-      "ip6": "fe80::205:ad00:1:6205",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-39-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:06",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.39",
-      "mac": "00:14:22:0c:da:7c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-39-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-39"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
deleted file mode 100755
index 9d88ff8d1d35bd32c792d3865f89c199181c3034..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "7D5GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.4",
-      "ip6": "fe80::214:22ff:fe0c:d9fa",
-      "mac": "00:14:22:0c:d9:fa",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-4.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.4",
-      "mac": "00:14:22:0c:d9:fb",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-4-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e9",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.4",
-      "ip6": "fe80::205:ad00:1:61e9",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-4-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ea",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.4",
-      "mac": "00:14:22:0c:d9:fa",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-4-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
deleted file mode 100755
index eb8640f5cdd41fad6f41144b44c1871e4a8992a8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": ""
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.40",
-      "ip6": "fe80::213:72ff:fe69:864c",
-      "mac": "00:13:72:69:86:4c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-40.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.40",
-      "mac": "00:13:72:69:86:4d",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-40-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b3:8f",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.40",
-      "ip6": "fe80::205:ad00:2:b38f",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-40-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b3:90",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.40",
-      "mac": "00:13:72:69:86:4c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-40-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-40"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
deleted file mode 100755
index 4559dd4171190c0d846d57d4af3571a8365cc00b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "05/12/2005",
-    "vendor": "Dell Computer Corporation",
-    "version": "A03"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "D35GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2110054400,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.41",
-      "ip6": "fe80::214:22ff:fe0c:b392",
-      "mac": "00:14:22:0c:b3:92",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-41.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.41",
-      "mac": "00:14:22:0c:b3:93",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-41-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:5e",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.41",
-      "ip6": "fe80::205:ad00:1:5a5e",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-41-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:5f",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.41",
-      "mac": "00:14:22:0c:b3:92",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-41-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-41"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
deleted file mode 100755
index 0dfd27205a73b1a76f64b90efe1336774d999b02..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "4KMGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.42",
-      "ip6": "fe80::214:22ff:fe0c:e1a4",
-      "mac": "00:14:22:0c:e1:a4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-42.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.42",
-      "mac": "00:14:22:0c:e1:a5",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-42-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:81",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.42",
-      "ip6": "fe80::205:ad00:1:6281",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-42-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:82",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.42",
-      "mac": "00:14:22:0c:e1:a4",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-42-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-42"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
deleted file mode 100755
index da05a5117efb074d1c2b499a2957aadc73fc6242..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "GC5GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.43",
-      "ip6": "fe80::214:22ff:fe0c:da8c",
-      "mac": "00:14:22:0c:da:8c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-43.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.43",
-      "mac": "00:14:22:0c:da:8d",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-43-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:75",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.43",
-      "ip6": "fe80::205:ad00:1:6275",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-43-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:76",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.43",
-      "mac": "00:14:22:0c:da:8c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-43-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-43"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
deleted file mode 100755
index 72ef66aada2dc5d1b036e454b19690e2e37f8484..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "835GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.44",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:b1:1c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-44.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.44",
-      "mac": "00:14:22:0c:b1:1d",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-44-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:92",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.44",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-44-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:93",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.44",
-      "mac": "00:14:22:0c:b1:1c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-44-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-44"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
deleted file mode 100755
index 6438faac3805657b2388b461cb0ff76a086006ea..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "725GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.45",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:da:88",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-45.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.45",
-      "mac": "00:14:22:0c:da:89",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-45-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:89",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.45",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-45-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:8a",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.45",
-      "mac": "00:14:22:0c:da:88",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-45-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-45"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
deleted file mode 100755
index 8ded10160be040d47c64ff25d5c4abca4f22f308..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "725GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.46",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:e1:7c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-46.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.46",
-      "mac": "00:14:22:0c:e1:7d",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-46-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:62",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.46",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-46-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:63",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.46",
-      "mac": "00:14:22:0c:e1:7c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-46-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-46"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
deleted file mode 100755
index e9842fbc4cc40163f5ae2d36cd1be82cbedeeed4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "6LZGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.47",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:de:34",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-47.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.47",
-      "mac": "00:14:22:0c:de:35",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-47-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b0:2c",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.47",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-47-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b0:2d",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.47",
-      "mac": "00:14:22:0c:de:34",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-47-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-47"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
deleted file mode 100755
index e61326dc5a15e96acfebb754872df64d7977d518..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "4LMGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.48",
-      "ip6": "fe80::214:22ff:fe0c:dbca",
-      "mac": "00:14:22:0c:db:ca",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-48.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.48",
-      "mac": "00:14:22:0c:db:cb",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-48-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:59",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.48",
-      "ip6": "fe80::205:ad00:1:6259",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-48-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:5a",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.48",
-      "mac": "00:14:22:0c:db:ca",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-48-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-48"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
deleted file mode 100755
index 0754259a999919a80d4e7d09218a567755fc35ac..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "JNFGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.49",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:da:30",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-49.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.49",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-49-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:04",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.49",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-49-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:05",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.49",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-49-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-49"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
deleted file mode 100755
index f7d4c401aa2df9ba05ef0f19d016dc7e25edb63c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "725GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.5",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:e1:74",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-5.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.5",
-      "mac": "00:14:22:0c:e1:75",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-5-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:b5",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.5",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-5-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:b6",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.5",
-      "mac": "00:14:22:0c:e1:74",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-5-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-5"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
deleted file mode 100755
index b739fd400ecbc93dfaf10df07ccb2f036fae7647..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "725GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.50",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:da:a6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-50.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.50",
-      "mac": "00:14:22:0c:da:a7",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-50-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:32",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.50",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-50-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:33",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.50",
-      "mac": "00:14:22:0c:da:a6",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-50-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-50"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
deleted file mode 100755
index 851b437d287d0952285c174978fac2d548287d05..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "FPFGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.51",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:da:7e",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-51.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.51",
-      "mac": "00:14:22:0c:da:7f",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-51-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:4f:03",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.51",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-51-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:4f:04",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.51",
-      "mac": "00:14:22:0c:da:7e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-51-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-51"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
deleted file mode 100755
index d665eeb3ffe146f958f9522e0d99ee463c43e111..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "725GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.6",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:da:6e",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-6.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.6",
-      "mac": "00:14:22:0c:da:6f",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-6-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:39",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.6",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-6-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:3a",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.6",
-      "mac": "00:14:22:0c:da:6e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-6-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-6"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
deleted file mode 100755
index 85db66431fa7acb81da090e355e15f077bdcb365..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "725GV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.7",
-      "ip6": "fe80::214:22ff:fe0c:da94",
-      "mac": "00:14:22:0c:e1:44",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-7.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.7",
-      "mac": "00:14:22:0c:e1:45",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-7-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:4e",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.7",
-      "ip6": "fe80::205:ad00:1:5a76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-7-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:4f",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.7",
-      "mac": "00:14:22:0c:e1:44",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-7-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-7"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
deleted file mode 100755
index 304e2bba1a00691df41ab6b5862714037cbb6396..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "05/12/2005",
-    "vendor": "Dell Computer Corporation",
-    "version": "A03"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "5PFGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.8",
-      "ip6": "fe80::214:22ff:fe0c:da40",
-      "mac": "00:14:22:0c:da:40",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-8.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.8",
-      "mac": "00:14:22:0c:da:41",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-8-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:aa:80",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.8",
-      "ip6": "fe80::205:ad00:2:aa80",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-8-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:aa:81",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.8",
-      "mac": "00:14:22:0c:da:40",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-8-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-8"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
deleted file mode 100755
index e1e893ed5a04962fe104dda743dd4660e3056141..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
-  },
-  "bios": {
-    "release_date": "01/09/2006",
-    "vendor": "Dell Computer Corporation",
-    "version": "A05"
-  },
-  "chassis": {
-    "manufacturer": "Dell Computer Corporation",
-    "name": "PowerEdge 1855",
-    "serial": "2QFGV1J"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 2109562880,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.0.9",
-      "ip6": "fe80::214:22ff:fe0c:da50",
-      "mac": "00:14:22:0c:da:50",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-9.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sbordeplage",
-      "switch_port": null,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.3.9",
-      "mac": "00:14:22:0c:da:51",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordeplage-9-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Intel",
-      "version": "82546GB Gigabit Ethernet Controller"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:80",
-      "interface": "InfiniBand",
-      "ip": "172.18.0.9",
-      "ip6": "fe80::205:ad00:2:a580",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-9-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:81",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25208 (MT23108 compat mode)"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.0.9",
-      "mac": "00:14:22:0c:da:50",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordeplage-9-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4820000000,
-    "node_flops": 9000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 16384,
-    "cache_l1i": 0,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 3000000000,
-    "instruction_set": "x86-64",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
-    "vendor": "Intel",
-    "version": "3.00GHz"
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "mptspi",
-      "interface": "SCSI",
-      "model": "ST373207LC",
-      "rev": "D701",
-      "size": 73407820800,
-      "vendor": "SEAGATE"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": false
-  },
-  "type": "node",
-  "uid": "bordeplage-9"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/bordereau.json b/data/grid5000/sites/bordeaux/clusters/bordereau/bordereau.json
deleted file mode 100755
index 63cdc85bc36c17ca1f292e7d3f7b3fd9a356a9f6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/bordereau.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "created_at": "Mon, 01 Oct 2007 12:00:00 GMT",
-  "kavlan": false,
-  "misc": "IPMI 2.0",
-  "model": "IBM System x3455",
-  "type": "cluster",
-  "uid": "bordereau"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
deleted file mode 100755
index a00a724f0b7f595c53dbdee237f3cb00d8c7cdfd..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": null
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.1",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C1",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.1",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-1-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.1",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-1-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-1"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
deleted file mode 100755
index a12c69b4e5c7829cec6c62b620fbf4ca5218c7dc..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWH"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.10",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6b:ca",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-10.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C10",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.10",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6b:cb",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-10-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.10",
-      "mac": "00:14:5e:55:6b:cc",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-10-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-10"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
deleted file mode 100755
index f23cfbeb49cf5496e01640bcab0e92718c478d0d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "09/15/2008",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.40-[C0E140AUS-1.40]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRXW"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.11",
-      "ip6": "fe80::214:5eff:fe55:5c81",
-      "mac": "00:14:5e:55:5c:81",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-11.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C11",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.11",
-      "ip6": "fe80::214:5eff:fe55:5c81",
-      "mac": "00:14:5e:55:5c:82",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-11-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.11",
-      "mac": "00:14:5e:55:5c:83",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-11-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-11"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
deleted file mode 100755
index 5886800f87ec314559da4d25522f1e76d23d631e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZR"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.12",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:58:f7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-12.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C12",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.12",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:58:f8",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-12-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.12",
-      "mac": "00:14:5e:55:58:f9",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-12-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-12"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
deleted file mode 100755
index eb6ce942689068ad91ac9ef37c62b71a69bdcc0b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRXK"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.13",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:59:63",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-13.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C13",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.13",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:59:64",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-13-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.13",
-      "mac": "00:14:5e:55:59:65",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-13-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-13"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
deleted file mode 100755
index b13695f582ce0f44c6eabf66290d36e77deaba8d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZF"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.14",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:59:5d",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-14.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C14",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.14",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:59:5e",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-14-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.14",
-      "mac": "00:14:5e:55:59:5f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-14-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-14"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
deleted file mode 100755
index 287e49ea81673226e47707a47c6af32576b036d5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWB"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.15",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6a:f2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-15.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C15",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.15",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6a:f3",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-15-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.15",
-      "mac": "00:14:5e:55:6a:f4",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-15-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-15"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
deleted file mode 100755
index 5797478e3ddcedd8501245812056c566ec0d7330..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRXD"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.16",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5d:ec",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-16.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C16",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.16",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5d:ed",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-16-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.16",
-      "mac": "00:14:5e:55:5d:ee",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-16-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-16"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
deleted file mode 100755
index 76c276026ae450452c5fc452029fb1a167b3df01..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYW"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.17",
-      "ip6": "fe80::214:5eff:fe55:5ea9",
-      "mac": "00:14:5e:55:5e:a9",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-17.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C17",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.17",
-      "ip6": "fe80::214:5eff:fe55:5ea9",
-      "mac": "00:14:5e:55:5e:aa",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-17-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.17",
-      "mac": "00:14:5e:55:5e:ab",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-17-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-17"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
deleted file mode 100755
index 9dca7167e7ad347267e24ee0806776a953a8c7d9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYN"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.18",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:64:0d",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-18.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C18",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.18",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:64:0e",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-18-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.18",
-      "mac": "00:14:5e:55:64:0f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-18-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-18"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
deleted file mode 100755
index bd787f618e56bfaa1a4c20f9a7777709450b3c6e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRXN"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.19",
-      "ip6": "fe80::214:5eff:fe55:6867",
-      "mac": "00:14:5e:55:68:67",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-19.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C19",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.19",
-      "ip6": "fe80::214:5eff:fe55:6867",
-      "mac": "00:14:5e:55:68:68",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-19-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.19",
-      "mac": "00:14:5e:55:68:69",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-19-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-19"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
deleted file mode 100755
index f3e4f18eb6cca3bff3f0f6d2f7db7b1a9e662be8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": null
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.2",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5d:2c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-2.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C2",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.2",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5d:2d",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-2-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.2",
-      "mac": "00:14:5e:55:5d:2e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-2-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-2"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
deleted file mode 100755
index b869f550fd57f8f66ccb15d3d8a0326cbd2b5457..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRXB"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.20",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:62:b1",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-20.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C20",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.20",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:62:b2",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-20-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.20",
-      "mac": "00:14:5e:55:62:b3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-20-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-20"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
deleted file mode 100755
index 23e9d3ae650f0514fc490a7068c7cace24ed0104..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRXV"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.21",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5a:98",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-21.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C21",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.21",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5a:99",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-21-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.21",
-      "mac": "00:14:5e:55:5a:9a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-21-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-21"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
deleted file mode 100755
index 1cf732fc3b45b0abbff5f944020d9651dcde4ae8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWY"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.22",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:59:84",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-22.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C22",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.22",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:59:85",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-22-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.22",
-      "mac": "00:14:5e:55:59:86",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-22-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-22"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
deleted file mode 100755
index 6347e391d372dccbc5a4e1217cdc236d1b4bd185..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWM"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.23",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:62:96",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-23.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C23",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.23",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:62:97",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-23-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.23",
-      "mac": "00:14:5e:55:62:98",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-23-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-23"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
deleted file mode 100755
index 12303c9adc6421d173af064056f83abe2b9ecb0e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDTAA"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.24",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5d:da",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-24.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": null,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.24",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5d:db",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-24-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.24",
-      "mac": "00:14:5e:55:5d:dc",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-24-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-24"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
deleted file mode 100755
index 1054a6c4ac070138f8ebd93fdab69ff3e8c6499d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYT"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.25",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5d:b9",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-25.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": null,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.25",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5d:ba",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-25-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.25",
-      "mac": "00:14:5e:55:5d:bb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-25-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-25"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
deleted file mode 100755
index 02629549ad729f0616c36be779bd21fbc2d3296c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRVW"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.26",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6d:2f",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-26.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": null,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.26",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6d:30",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-26-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.26",
-      "mac": "00:14:5e:55:6d:31",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-26-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-26"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
deleted file mode 100755
index ff1b7bafa18f91dc8e81c8ab9d1deaa3d89215af..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDTAG"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.27",
-      "ip6": "fe80::214:5eff:fe55:5c69",
-      "mac": "00:14:5e:55:5c:69",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-27.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": null,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.27",
-      "ip6": "fe80::214:5eff:fe55:5c69",
-      "mac": "00:14:5e:55:5c:6a",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-27-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.27",
-      "mac": "00:14:5e:55:5d:6b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-27-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2592000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-27"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
deleted file mode 100755
index 04bb1e9bf138568365e8166e756a076a800d912a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYZ"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.28",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5e:88",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-28.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/E4",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.28",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5e:89",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-28-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.28",
-      "mac": "00:14:5e:55:5e:8a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-28-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-28"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
deleted file mode 100755
index 42b36b6bc1ab0e41769052d0e698109345e08c70..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDTAH"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.29",
-      "ip6": "fe80::214:5eff:fe55:5cc3",
-      "mac": "00:14:5e:55:5c:c3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-29.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/E5",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.29",
-      "ip6": "fe80::214:5eff:fe55:5cc3",
-      "mac": "00:14:5e:55:5c:c4",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-29-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.29",
-      "mac": "00:14:5e:55:5c:c5",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-29-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-29"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
deleted file mode 100755
index 01df4a955a272ee86323482134b2c2a7ae7ac2e5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZH"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.3",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:42",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-3.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C3",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.3",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:43",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-3-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.3",
-      "mac": "00:14:5e:55:5c:44",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-3-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-3"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
deleted file mode 100755
index 35a9edaad5c2d18f4134ca8806eae6799697788e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": null
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.30",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5e:d6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-30.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/E6",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.30",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5e:d7",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-30-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.30",
-      "mac": "00:14:5e:55:5e:d8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-30-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-30"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
deleted file mode 100755
index 2a525525fc992fbc407767196af2ea30bcc79593..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWL"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.31",
-      "ip6": "fe80::214:5eff:fe55:59b7",
-      "mac": "00:14:5e:55:59:b7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-31.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/E7",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.31",
-      "ip6": "fe80::214:5eff:fe55:59b7",
-      "mac": "00:14:5e:55:59:b8",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-31-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.31",
-      "mac": "00:14:5e:55:59:b9",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-31-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2592000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-31"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
deleted file mode 100755
index 1bab5e9d88f2762a97683a01c16e6cf24a9efd9e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRXA"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.32",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:59:bd",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-32.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/E8",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.32",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:59:be",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-32-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.32",
-      "mac": "00:14:5e:55:59:bf",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-32-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-32"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
deleted file mode 100755
index 6b7cca113f40087be094c636f83d2e6e1b226d70..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "09/15/2008",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.40-[C0E140AUS-1.40]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYH"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.33",
-      "ip6": "fe80::214:5eff:fe55:5eb2",
-      "mac": "00:14:5e:55:5e:b2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-33.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/E9",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.33",
-      "ip6": "fe80::214:5eff:fe55:5eb2",
-      "mac": "00:14:5e:55:5e:b3",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-33-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.33",
-      "mac": "00:14:5e:55:5e:b4",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-33-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2592000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-33"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
deleted file mode 100755
index 40ec7532a2d6b7511070e6c481c895ac66a431ec..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": null
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.34",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5d:02",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-34.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/E10",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.34",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5d:03",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-34-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.34",
-      "mac": "00:14:5e:55:5d:04",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-34-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-34"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
deleted file mode 100755
index 45bde1ba8c41c56b25c9de2a3b86344285cb8aab..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZZ"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.35",
-      "ip6": "fe80::214:5eff:fe55:5e22",
-      "mac": "00:14:5e:55:5e:22",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-35.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/E11",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.35",
-      "ip6": "fe80::214:5eff:fe55:5e22",
-      "mac": "00:14:5e:55:5e:23",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-35-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.35",
-      "mac": "00:14:5e:55:5e:24",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-35-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-35"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
deleted file mode 100755
index ef14400dc6673f4baad72e37b58b3cf9f50da72f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDTAC"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.36",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:69:f0",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-36.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/E12",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.36",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:69:f1",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-36-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.36",
-      "mac": "00:14:5e:55:69:f2",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-36-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-36"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
deleted file mode 100755
index 79d47c839f6ce3682af3066a4091c6d0336b8600..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZL"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.37",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5f:d2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-37.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/E13",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.37",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5f:d3",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-37-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.37",
-      "mac": "00:14:5e:55:5f:d4",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-37-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-37"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
deleted file mode 100755
index 84765ece644ae2ab7cf04edc4d30a4399071fef4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZP"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.38",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5f:0f",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-38.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/E14",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.38",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5f:10",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-38-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.38",
-      "mac": "00:14:5e:55:5f:11",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-38-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-38"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
deleted file mode 100755
index 630471cb3e0d3de6f456ba355d6c0b7697c0b413..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYG"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.39",
-      "ip6": "fe80::214:5eff:fe55:632f",
-      "mac": "00:14:5e:55:63:2f",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-39.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/B1",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.39",
-      "ip6": "fe80::214:5eff:fe55:632f",
-      "mac": "00:14:5e:55:63:30",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-39-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.39",
-      "mac": "00:14:5e:55:63:31",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-39-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-39"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
deleted file mode 100755
index e60b3f8cc532769d4650420c6981c4abdf9670f2..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": null
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.4",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:68:c7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-4.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C4",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.4",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:68:c8",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-4-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.4",
-      "mac": "00:14:5e:55:68:c9",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-4-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
deleted file mode 100755
index dc144e6a456defefcd136fc90e5a52833def60c0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": null
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.40",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-40.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/B2",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.40",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-40-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.40",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-40-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-40"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
deleted file mode 100755
index fd694ab3b6bd8e5e11f96d86977e7e7832992c72..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYB"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.41",
-      "ip6": "fe80::214:5eff:fe55:5900",
-      "mac": "00:14:5e:55:59:00",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-41.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/B3",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.41",
-      "ip6": "fe80::214:5eff:fe55:5900",
-      "mac": "00:14:5e:55:59:01",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-41-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.41",
-      "mac": "00:14:5e:55:59:02",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-41-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-41"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
deleted file mode 100755
index 12f73513a03ab7f7de8132f1774206ecf410012a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYF"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.42",
-      "ip6": "fe80::214:5eff:fe55:6095",
-      "mac": "00:14:5e:55:60:95",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-42.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/B4",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.42",
-      "ip6": "fe80::214:5eff:fe55:6095",
-      "mac": "00:14:5e:55:60:96",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-42-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.42",
-      "mac": "00:14:5e:55:60:97",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-42-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-42"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
deleted file mode 100755
index d3c0f6cae09c454ab14b7ae07469ea774608deaf..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWD"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.43",
-      "ip6": "fe80::214:5eff:fe55:6c00",
-      "mac": "00:14:5e:55:6c:00",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-43.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/B5",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.43",
-      "ip6": "fe80::214:5eff:fe55:6c00",
-      "mac": "00:14:5e:55:6c:01",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-43-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.43",
-      "mac": "00:14:5e:55:6c:02",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-43-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-43"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
deleted file mode 100755
index 94c68c93a293cfaabfa13155405c9c3369d0becf..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRXL"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.44",
-      "ip6": "fe80::214:5eff:fe55:59d2",
-      "mac": "00:14:5e:55:59:d2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-44.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/B6",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.44",
-      "ip6": "fe80::214:5eff:fe55:59d2",
-      "mac": "00:14:5e:55:59:d3",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-44-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.44",
-      "mac": "00:14:5e:55:59:d4",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-44-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-44"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
deleted file mode 100755
index dbe68d6a5ef442e91123196b9a94320f5101ba80..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWZ"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.45",
-      "ip6": "fe80::214:5eff:fe55:5cbd",
-      "mac": "00:14:5e:55:5c:bd",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-45.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/B7",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.45",
-      "ip6": "fe80::214:5eff:fe55:5cbd",
-      "mac": "00:14:5e:55:5c:be",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-45-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.45",
-      "mac": "00:14:5e:55:5c:bf",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-45-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-45"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
deleted file mode 100755
index c423ef9c9a6c8a1034cce162d52cfdbb997d59d5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYY"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.46",
-      "ip6": "fe80::214:5eff:fe55:5c60",
-      "mac": "00:14:5e:55:5c:60",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-46.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/B8",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.46",
-      "ip6": "fe80::214:5eff:fe55:5c60",
-      "mac": "00:14:5e:55:5c:61",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-46-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.46",
-      "mac": "00:14:5e:55:5c:62",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-46-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-46"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
deleted file mode 100755
index 2445ca0ed5f1c686ddd32e300d8533d16ba26b04..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWA"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.47",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6c:a8",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-47.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/B9",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.47",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6c:a9",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-47-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.47",
-      "mac": "00:14:5e:55:6c:aa",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-47-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-47"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
deleted file mode 100755
index 030cc060078505faf18cf5829aa9ccaf739ada66..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "09/15/2008",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.40-[C0E140AUS-1.40]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZV"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.48",
-      "ip6": "fe80::214:5eff:fe55:58fd",
-      "mac": "00:14:5e:55:58:fd",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-48.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/B10",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.48",
-      "ip6": "fe80::214:5eff:fe55:58fd",
-      "mac": "00:14:5e:55:58:fe",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-48-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.48",
-      "mac": "00:14:5e:55:58:ff",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-48-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-48"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
deleted file mode 100755
index 95fd0744de3ad90790d307b1c640644baa4bb358..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZA"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.49",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:62:e7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-49.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/B11",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.49",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:62:e8",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-49-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.49",
-      "mac": "00:14:5e:55:62:d9",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-49-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-49"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
deleted file mode 100755
index 050b6b83b0a354f90c0420167be1fcb900c5a715..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRXT"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.5",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:61:94",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-5.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C5",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.5",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:61:95",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-5-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.5",
-      "mac": "00:14:5e:55:61:96",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-5-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-5"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
deleted file mode 100755
index 2450bea1eccd4f0654092aba89336cee1f03fbc6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "09/15/2008",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.40-[C0E140AUS-1.40]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYR"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.50",
-      "ip6": "fe80::214:5eff:fe55:5eac",
-      "mac": "00:14:5e:55:5e:ac",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-50.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/B12",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.50",
-      "ip6": "fe80::214:5eff:fe55:5eac",
-      "mac": "00:14:5e:55:5e:ad",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-50-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.50",
-      "mac": "00:14:5e:55:5e:ae",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-50-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-50"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
deleted file mode 100755
index 60d1b62158b0c752576589ea9614720465fe067e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYA"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.51",
-      "ip6": "fe80::214:5eff:fe55:5cd5",
-      "mac": "00:14:5e:55:5c:d5",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-51.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/B13",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.51",
-      "ip6": "fe80::214:5eff:fe55:5cd5",
-      "mac": "00:14:5e:55:5c:d6",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-51-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.51",
-      "mac": "00:14:5e:55:5c:d7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-51-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-51"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
deleted file mode 100755
index 980c4366922e37612c73036b87c00a268e999b15..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYP"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.52",
-      "ip6": "fe80::214:5eff:fe55:5db3",
-      "mac": "00:14:5e:55:5d:b3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-52.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/B14",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.52",
-      "ip6": "fe80::214:5eff:fe55:5db3",
-      "mac": "00:14:5e:55:5d:b4",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-52-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.52",
-      "mac": "00:14:5e:55:5d:b5",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-52-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2592000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-52"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
deleted file mode 100755
index 5a0c71e6d9fb3cb43fc52501e0ad663fc7ec4e55..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRVV"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.53",
-      "ip6": "fe80::214:5eff:fe55:6c1b",
-      "mac": "00:14:5e:55:6c:1b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-53.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/B15",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.53",
-      "ip6": "fe80::214:5eff:fe55:6c1b",
-      "mac": "00:14:5e:55:6c:1c",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-53-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.53",
-      "mac": "00:14:5e:55:6c:1d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-53-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-53"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
deleted file mode 100755
index f324615a9a34130f554f41f596199e44434071be..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZX"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.54",
-      "ip6": "fe80::214:5eff:fe55:63b6",
-      "mac": "00:14:5e:55:63:b6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-54.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/B16",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.54",
-      "ip6": "fe80::214:5eff:fe55:63b6",
-      "mac": "00:14:5e:55:63:b7",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-54-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.54",
-      "mac": "00:14:5e:55:63:b8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-54-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-54"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
deleted file mode 100755
index 80421cc3859750f8a8965e6da85324f14913073a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZY"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.55",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:ed",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-55.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": null,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.55",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:ee",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-55-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.55",
-      "mac": "00:14:5e:55:5c:ef",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-55-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-55"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
deleted file mode 100755
index 5631d0942f0c9ee9c5555c2516b29bb88e4711c5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZT"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.56",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:60:cb",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-56.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D1",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.56",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:60:cc",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-56-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.56",
-      "mac": "00:14:5e:55:60:cd",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-56-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-56"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
deleted file mode 100755
index 56294b8606c9c16d07e68c1836f821050d02b8e2..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": null
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.57",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-57.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D2",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.57",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": null,
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-57-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.57",
-      "mac": null,
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-57-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-57"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
deleted file mode 100755
index 8e7a9fcaf35b4a5041688c40965963051f27c1bf..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZC"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.58",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5e:a6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-58.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D3",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.58",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5e:a7",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-58-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.58",
-      "mac": "00:14:5e:55:5e:a8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-58-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-58"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
deleted file mode 100755
index 38ec1c7a83f268be16ffef35bd977c5c4a6b6424..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZD"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.59",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:d8",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-59.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D4",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.59",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:d9",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-59-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.59",
-      "mac": "00:14:5e:55:5c:da",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-59-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-59"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
deleted file mode 100755
index 94721e1a7e63f96f1702914ba18ba99122c83800..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZM"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.6",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:58:ee",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-6.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C6",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.6",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:58:ef",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-6-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.6",
-      "mac": "00:14:5e:55:58:f0",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-6-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-6"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
deleted file mode 100755
index 147c03ef880e861ebdf80ef0e17f5ce0258143f6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZN"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.60",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5b:5b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-60.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D5",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.60",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5b:5c",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-60-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.60",
-      "mac": "00:14:5e:55:5b:5d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-60-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-60"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
deleted file mode 100755
index 32c6d0d1e447588382984368eef7cf5b6a5692fe..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDTAL"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.61",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:58:49",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-61.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D6",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.61",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:58:4a",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-61-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.61",
-      "mac": "00:14:5e:55:58:4b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-61-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-61"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
deleted file mode 100755
index 1d4e38d85cd990b5c6f11bf13660f6a32cc8743b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWT"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.62",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:63:26",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-62.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D7",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.62",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:63:27",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-62-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.62",
-      "mac": "00:14:5e:55:63:28",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-62-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-62"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
deleted file mode 100755
index 173b3220b47d35c27b13a09d4c0f951a65e50f82..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZB"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.63",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:6c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-63.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D8",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.63",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:6d",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-63-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.63",
-      "mac": "00:14:5e:55:5c:6e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-63-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-63"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
deleted file mode 100755
index f9c1315dee5ddb16d3ad8c7a6522d37435894429..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDTAD"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.64",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:cf",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-64.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D9",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.64",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:d0",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-64-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.64",
-      "mac": "00:14:5e:55:5c:d1",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-64-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-64"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
deleted file mode 100755
index ec0fa5778cca774ab72b2baaf58e4e9ad07782ac..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWX"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.65",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:59:f9",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-65.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D10",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.65",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:59:fa",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-65-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.65",
-      "mac": "00:14:5e:55:59:fb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-65-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-65"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
deleted file mode 100755
index 1a0a53c1fd68c701bca6e64e239274838c5b73e1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYX"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.66",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5e:19",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-66.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D11",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.66",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5e:1a",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-66-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.66",
-      "mac": "00:14:5e:55:5e:1b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-66-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-66"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
deleted file mode 100755
index 30f23f6d0d8031c4ac186874451a3cbf21ff91f5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZW"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.67",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:1b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-67.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D12",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.67",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:1c",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-67-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.67",
-      "mac": "00:14:5e:55:5c:1d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-67-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-67"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
deleted file mode 100755
index b7cb65c896e2d6791d4c356e2852c3cced57cc0b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRXZ"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.68",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:57:89",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-68.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D13",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.68",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:57:8a",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-68-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.68",
-      "mac": "00:14:5e:55:57:8b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-68-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-68"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
deleted file mode 100755
index fe5debcdd044e757148e213fa7487c80d624ed41..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWW"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.69",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:63:ce",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-69.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D14",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.69",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:63:cf",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-69-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.69",
-      "mac": "00:14:5e:55:63:d0",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-69-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-69"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
deleted file mode 100755
index f3bb49b68607d32a8a679ff9b5c6e15926fcdbab..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRVP"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.7",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5e:7c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-7.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C7",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.7",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5e:7d",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-7-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.7",
-      "mac": "00:14:5e:55:5e:7e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-7-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-7"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
deleted file mode 100755
index 86f04c3b772d5bd421f33f056f46375a12ee3b84..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWC"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.70",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6a:fe",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-70.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D15",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.70",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6a:ff",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-70-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.70",
-      "mac": "00:14:5e:55:6b:00",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-70-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-70"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
deleted file mode 100755
index 66c99c340d00c2f88f0b7d19ba56454b08324837..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRZK"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.71",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:59:44",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-71.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D16",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.71",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:59:45",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-71-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.71",
-      "mac": "00:14:5e:55:59:46",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-71-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-71"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
deleted file mode 100755
index 7c913e55b84e2b9e833259aff838c6139e36aecf..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRXM"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.72",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5a:3e",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-72.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D17",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.72",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5a:3f",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-72-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.72",
-      "mac": "00:14:5e:55:5a:40",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-72-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-72"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
deleted file mode 100755
index 8bec28baced791c13c81ee716656c469a040878f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDTAK"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.73",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6a:1a",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-73.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D18",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.73",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6a:1b",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-73-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.73",
-      "mac": "00:14:5e:55:6a:1c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-73-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-73"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
deleted file mode 100755
index 6ecc24c84c0636695e05a3187a3d30f6362c0af4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYM"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.74",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:64:04",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-74.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D19",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.74",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:64:05",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-74-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.74",
-      "mac": "00:14:5e:55:64:06",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-74-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-74"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
deleted file mode 100755
index ee836846da188fd38b13a69b983a77836876cd70..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWV"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.75",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5e:af",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-75.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D20",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.75",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5e:b0",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-75-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.75",
-      "mac": "00:14:5e:55:5e:b1",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-75-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-75"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
deleted file mode 100755
index e786f682d07c384ff731a7428b5e6f037eafc870..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDTAF"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.76",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5d:08",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-76.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D21",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.76",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5d:09",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-76-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.76",
-      "mac": "00:14:5e:55:5d:0a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-76-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-76"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
deleted file mode 100755
index 3a17a30fbe9e8b7624bc2d359d2c2232792f54fb..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWN"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.77",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:63:5f",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-77.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D22",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.77",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:63:60",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-77-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.77",
-      "mac": "00:14:5e:55:63:61",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-77-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-77"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
deleted file mode 100755
index 3457e19520285847678219767de7f335a4489377..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRXP"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.78",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:63:fb",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-78.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/D23",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.78",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:63:fc",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-78-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.78",
-      "mac": "00:14:5e:55:63:fd",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-78-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-78"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
deleted file mode 100755
index 424fc241e77e1184759d2d8aa2b4e5907c6daa7a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": null
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.79",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:62:ed",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-79.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": null,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.79",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:62:ee",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-79-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.79",
-      "mac": "00:14:5e:55:62:ef",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-79-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-79"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
deleted file mode 100755
index 7d7364e58d2682b61405de8c81a9948b35ccbd89..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRVT"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.8",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:60:f8",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-8.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C8",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.8",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:60:f9",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-8-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.8",
-      "mac": "00:14:5e:55:60:fa",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-8-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-8"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
deleted file mode 100755
index f22b9b0a78aeb7dc366d6fcac16f3cc15300d265..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYL"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.80",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:ae",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-80.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/F1",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.80",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:af",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-80-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.1.80",
-      "mac": "00:14:5e:55:5c:b0",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-80-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-80"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
deleted file mode 100755
index 3271e0961bfe9b43388120177381acdd4f358bfe..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYV"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.81",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:58:a6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-81.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/F2",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.81",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:58:a7",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-81-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.1.81",
-      "mac": "00:14:5e:55:58:a8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-81-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-81"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
deleted file mode 100755
index b4fae7e3120cc424320584fb2c866dd31e9d19c7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRVZ"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.82",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:68:85",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-82.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/F3",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.82",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:68:86",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-82-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.1.82",
-      "mac": "00:14:5e:55:68:87",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-82-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-82"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
deleted file mode 100755
index 966d8b9b5a9f14202f23b78a339c67e5e1ee4382..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRVY"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.83",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6d:23",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-83.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/F4",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.83",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6d:24",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-83-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.1.83",
-      "mac": "00:14:5e:55:6d:25",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-83-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-83"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
deleted file mode 100755
index 20fdb4245b8f8db69a29194df0d069251c07301b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWR"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.84",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:48",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-84.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/F5",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.84",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:49",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-84-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.1.84",
-      "mac": "00:14:5e:55:5c:4a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-84-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-84"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
deleted file mode 100755
index 04ebbc05b3f45508f77e35144cf13f0d7f214e6c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYC"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.85",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:59:41",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-85.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/F6",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.85",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:59:42",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-85-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.1.85",
-      "mac": "00:14:5e:55:59:43",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-85-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-85"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
deleted file mode 100755
index ebbc4b30aeed7eb9d2134078d24ea76d5391911f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYK"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.86",
-      "ip6": "fe80::214:5eff:fe55:68ca",
-      "mac": "00:14:5e:55:68:ca",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-86.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/F8",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.86",
-      "ip6": "fe80::214:5eff:fe55:68ca",
-      "mac": "00:14:5e:55:68:cb",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-86-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.1.86",
-      "mac": "00:14:5e:55:68:cc",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-86-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-86"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
deleted file mode 100755
index 0c7a2f0892c367d32eeecb54e1c7ee811fde4c30..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRXC"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.87",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5e:28",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-87.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/F8",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.87",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5e:29",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-87-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.1.87",
-      "mac": "00:14:5e:55:5e:2a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-87-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-87"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
deleted file mode 100755
index e528e2e21795c93556982204901cb796c22bbedd..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRXF"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.88",
-      "ip6": "fe80::214:5eff:fe55:5d6b",
-      "mac": "00:14:5e:55:5d:6b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-88.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/F9",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.88",
-      "ip6": "fe80::214:5eff:fe55:5d6b",
-      "mac": "00:14:5e:55:5d:6c",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-88-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.1.88",
-      "mac": "00:14:5e:55:5d:6d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-88-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-88"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
deleted file mode 100755
index 4cf7567e4be5eccfb68ed986ed29925173a33129..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWF"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.89",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6d:05",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-89.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/F10",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.89",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6d:06",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-89-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.1.89",
-      "mac": "00:14:5e:55:6d:07",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-89-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-89"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
deleted file mode 100755
index 85d1624102e9fb323b01e149766b741326d6ef22..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRXX"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.9",
-      "ip6": "fe80::214:5eff:fe55:5ee8",
-      "mac": "00:14:5e:55:5e:e8",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-9.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/C9",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.9",
-      "ip6": "fe80::214:5eff:fe55:5ee8",
-      "mac": "00:14:5e:55:5e:e9",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-9-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.4.9",
-      "mac": "00:14:5e:55:5e:ea",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-9-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-9"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
deleted file mode 100755
index f359d8a1053983f505c9d5bd687659d30b21a98e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "09/15/2008",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.40-[C0E140AUS-1.40]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWG"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.90",
-      "ip6": "fe80::214:5eff:fe55:6d29",
-      "mac": "00:14:5e:55:6d:29",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-90.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/F11",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.90",
-      "ip6": "fe80::214:5eff:fe55:6d29",
-      "mac": "00:14:5e:55:6d:2a",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-90-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.1.90",
-      "mac": "00:14:5e:55:6d:2b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-90-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-90"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
deleted file mode 100755
index 8e3cc1435213af2ee1bd5e6181a2bb9a27dabc8d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDTAB"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.91",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:c6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-91.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/F12",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.91",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:5c:c7",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-91-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.1.91",
-      "mac": "00:14:5e:55:5c:c8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-91-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-91"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
deleted file mode 100755
index 6c032e733da7a848a74a583b74f9bf043a1309c7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRYD"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.92",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6a:4a",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-92.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/F13",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.92",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6a:4b",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-92-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.1.92",
-      "mac": "00:14:5e:55:6a:4c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-92-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-92"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
deleted file mode 100755
index 2efc1fec8c13dfddcdfaa04b070e6c1bb4058589..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "01/04/2007",
-    "vendor": "IBM",
-    "version": "IBM BIOS Version 1.32-[C0E132AUS-1.32]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3455-[7986Z1J]-",
-    "serial": "KDDDRWP"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 4157911040,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.1.93",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6d:14",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordereau-93.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-bordeaux",
-      "switch_port": "Gi/F14",
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.4.93",
-      "ip6": "fe80::214:5eff:fe55:6ca8",
-      "mac": "00:14:5e:55:6d:15",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "bordereau-93-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "BCM5704"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.1.93",
-      "mac": "00:14:5e:55:6d:16",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "bordereau-93-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4433200000,
-    "node_flops": 16330000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2593000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_svw",
-      "interface": "SATA",
-      "model": "Hitachi HDS72168",
-      "rev": "P21O",
-      "size": 80032038912,
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "bordereau-93"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/borderline.json b/data/grid5000/sites/bordeaux/clusters/borderline/borderline.json
deleted file mode 100755
index 0a5be487767d05da7f320bc0565f83763addd4ce..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/borderline/borderline.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "created_at": "Mon, 01 Oct 2007 12:00:00 GMT",
-  "kavlan": false,
-  "misc": "IPMI 2.0",
-  "model": "IBM System x3755",
-  "type": "cluster",
-  "uid": "borderline"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
deleted file mode 100755
index 1cc595b82ed89831a6dff81cf2940af55a8c8926..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 4,
-    "smt_size": 8
-  },
-  "bios": {
-    "release_date": "08/09/2007",
-    "vendor": "IBM",
-    "version": "-[ZYE133AUS-1.13]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3755 -[88774RG]-",
-    "serial": "99A3249"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 31760584704,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.2.1",
-      "ip6": "fe80::214:5eff:fe57:cc3e",
-      "mac": "00:14:5e:57:67:04",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sborderline",
-      "switch_port": null,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.5.1",
-      "mac": "00:14:5e:57:67:02",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "borderline-1-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:5d",
-      "interface": "InfiniBand",
-      "ip": "172.18.2.1",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-1-ib0.bordeaux.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:5e",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.18.2.11",
-      "ip6": "fe80::260:ddff:fe47:b67a",
-      "mac": "00:60:dd:47:b6:e9",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-1-myri0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.2.1",
-      "mac": "00:14:5e:57:67:06",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "borderline-1-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4424000000,
-    "node_flops": 34880000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2599000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 8218",
-    "vendor": "AMD",
-    "version": 8218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "aacraid",
-      "interface": "SAS",
-      "model": "8k-l Stripe",
-      "rev": "V1.0",
-      "size": 586772643840,
-      "vendor": "ServeRA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "borderline-1"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
deleted file mode 100755
index ed9c58f1cd7c2ea9a1b7981052786b2628ab86ce..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 4,
-    "smt_size": 8
-  },
-  "bios": {
-    "release_date": "02/23/2007",
-    "vendor": "IBM",
-    "version": "-[ZYE129AUS-1.08]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3755 -[88774RG]-",
-    "serial": "99A3258"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 31760584704,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.2.10",
-      "ip6": "fe80::214:5eff:fe57:cc3e",
-      "mac": "00:14:5e:57:cb:f6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-10.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sborderline",
-      "switch_port": null,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.5.10",
-      "mac": "00:14:5e:57:cb:f4",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "borderline-10-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:fd",
-      "interface": "InfiniBand",
-      "ip": "172.18.2.10",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-10-ib0.bordeaux.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:fe",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.18.2.20",
-      "ip6": "fe80::260:ddff:fe47:b67a",
-      "mac": "00:60:dd:47:b7:28",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-10-myri0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.2.10",
-      "mac": "00:14:5e:57:cb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "borderline-10-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4424000000,
-    "node_flops": 34880000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2599000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 8218",
-    "vendor": "AMD",
-    "version": 8218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "aacraid",
-      "interface": "SAS",
-      "model": "8k-l Stripe",
-      "rev": "V1.0",
-      "size": 586772643840,
-      "vendor": "ServeRA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "borderline-10"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
deleted file mode 100755
index 2f4365b3d84c7251bbcd6c504488589fe4a0c0a0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 4,
-    "smt_size": 8
-  },
-  "bios": {
-    "release_date": "02/23/2007",
-    "vendor": "IBM",
-    "version": "-[ZYE129AUS-1.08]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3755 -[88774RG]-",
-    "serial": "99A3255"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 31760584704,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.2.2",
-      "ip6": "fe80::214:5eff:fe57:cc3e",
-      "mac": "00:14:5e:57:cc:3e",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-2.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sborderline",
-      "switch_port": null,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.5.2",
-      "mac": "00:14:5e:57:cc:3c",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "borderline-2-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:85",
-      "interface": "InfiniBand",
-      "ip": "172.18.2.2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-2-ib0.bordeaux.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:86",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.18.2.12",
-      "ip6": "fe80::260:ddff:fe47:b67a",
-      "mac": "00:60:dd:47:b6:7a",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-2-myri0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.2.2",
-      "mac": "00:14:5e:57:cc:40",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "borderline-2-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4424000000,
-    "node_flops": 34880000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2599000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 8218",
-    "vendor": "AMD",
-    "version": 8218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "aacraid",
-      "interface": "SAS",
-      "model": "8k-l Stripe",
-      "rev": "V1.0",
-      "size": 586772643840,
-      "vendor": "ServeRA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "borderline-2"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
deleted file mode 100755
index fd66645286ecd14b98880c693fe112269143975d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 4,
-    "smt_size": 8
-  },
-  "bios": {
-    "release_date": "02/23/2007",
-    "vendor": "IBM",
-    "version": "-[ZYE129AUS-1.08]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3755 -[88774RG]-",
-    "serial": "99A3248"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 33878695936,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.2.3",
-      "ip6": "fe80::214:5eff:fe57:6da0",
-      "mac": "00:14:5e:57:6d:a0",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-3.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sborderline",
-      "switch_port": null,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.5.3",
-      "mac": "00:14:5e:57:6d:9e",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "borderline-3-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:ed",
-      "interface": "InfiniBand",
-      "ip": "172.18.2.3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-3-ib0.bordeaux.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:ee",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.18.2.13",
-      "ip6": "fe80::260:ddff:fe47:b569",
-      "mac": "00:60:dd:47:b5:69",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-3-myri0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.2.3",
-      "mac": "00:14:5e:57:6d:a2",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "borderline-3-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4424000000,
-    "node_flops": 34880000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2599000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 8218",
-    "vendor": "AMD",
-    "version": 8218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "aacraid",
-      "interface": "SAS",
-      "model": "8k-l Stripe",
-      "rev": "V1.0",
-      "size": 586783129600,
-      "vendor": "ServeRA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "borderline-3"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
deleted file mode 100755
index deccc1c6810117d2b050edf36ccbaa2041f058d5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 4,
-    "smt_size": 8
-  },
-  "bios": {
-    "release_date": "02/23/2007",
-    "vendor": "IBM",
-    "version": "-[ZYE129AUS-1.08]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3755 -[88774RG]-",
-    "serial": "99A3252"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 33878695936,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.2.4",
-      "ip6": "fe80::214:5eff:fe57:c4d0",
-      "mac": "00:14:5e:57:c4:d0",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-4.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sborderline",
-      "switch_port": null,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.5.4",
-      "mac": "00:14:5e:57:c4:ce",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "borderline-4-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1e:85",
-      "interface": "InfiniBand",
-      "ip": "172.18.2.4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-4-ib0.bordeaux.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1e:86",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.18.2.14",
-      "ip6": "fe80::260:ddff:fe47:b76e",
-      "mac": "00:60:dd:47:b7:6e",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-4-myri0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.2.4",
-      "mac": "00:14:5e:57:c4:d2",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "borderline-4-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4424000000,
-    "node_flops": 34880000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2599000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 8218",
-    "vendor": "AMD",
-    "version": 8218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "aacraid",
-      "interface": "SAS",
-      "model": "8k-l Stripe",
-      "rev": "V1.0",
-      "size": 586783129600,
-      "vendor": "ServeRA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "borderline-4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
deleted file mode 100755
index 28ef872c6e21593cb6370f1adfe8c161f19e7346..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 4,
-    "smt_size": 8
-  },
-  "bios": {
-    "release_date": "02/23/2007",
-    "vendor": "IBM",
-    "version": "-[ZYE129AUS-1.08]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3755 -[88774RG]-",
-    "serial": "99A3257"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 33878695936,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.2.5",
-      "ip6": "fe80::214:5eff:fe57:6d46",
-      "mac": "00:14:5e:57:6d:46",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-5.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sborderline",
-      "switch_port": null,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.5.5",
-      "mac": "00:14:5e:57:6d:44",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "borderline-5-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4d",
-      "interface": "InfiniBand",
-      "ip": "172.18.2.5",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-5-ib0.bordeaux.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4e",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.18.2.15",
-      "ip6": "fe80::260:ddff:fe47:b650",
-      "mac": "00:60:dd:47:b6:50",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-5-myri0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.2.5",
-      "mac": "00:14:5e:57:6d:48",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "borderline-5-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4424000000,
-    "node_flops": 34880000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2599000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 8218",
-    "vendor": "AMD",
-    "version": 8218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "aacraid",
-      "interface": "SAS",
-      "model": "8k-l Stripe",
-      "rev": "V1.0",
-      "size": 586772643840,
-      "vendor": "ServeRA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "borderline-5"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
deleted file mode 100755
index ed81d8c0a5416ef115c6ae865a4a5a24a74a4a1d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 4,
-    "smt_size": 8
-  },
-  "bios": {
-    "release_date": "08/09/2007",
-    "vendor": "IBM",
-    "version": "ZYE133AUS-1.13"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3755 -[88774RG]-",
-    "serial": "99A3256"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 33878695936,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.2.6",
-      "ip6": "fe80::214:5eff:fe57:82a6",
-      "mac": "00:14:5e:57:82:a6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-6.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sborderline",
-      "switch_port": null,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.5.6",
-      "mac": "00:14:5e:57:82:a4",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "borderline-6-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:2d",
-      "interface": "InfiniBand",
-      "ip": "172.18.2.6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-6-ib0.bordeaux.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:2e",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.18.2.16",
-      "ip6": "fe80::260:ddff:fe47:b67d",
-      "mac": "00:60:dd:47:b6:7d",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-6-myri0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.2.6",
-      "mac": "00:14:5e:57:82:a8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "borderline-6-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4424000000,
-    "node_flops": 34880000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2599000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 8218",
-    "vendor": "AMD",
-    "version": 8218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "aacraid",
-      "interface": "SAS",
-      "model": "8k-l Stripe",
-      "rev": "V1.0",
-      "size": 586783129600,
-      "vendor": "ServeRA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "borderline-6"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
deleted file mode 100755
index 15447f7bdc62dc5366f67a599de041ef52fe8693..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 4,
-    "smt_size": 8
-  },
-  "bios": {
-    "release_date": "02/23/2007",
-    "vendor": "IBM",
-    "version": "-[ZYE129AUS-1.08]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3755 -[88774RG]-",
-    "serial": "99A3251"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 33878695936,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.2.7",
-      "ip6": "fe80::214:5eff:fe57:cc02",
-      "mac": "00:14:5e:57:cc:02",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-7.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sborderline",
-      "switch_port": null,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.5.7",
-      "mac": "00:14:5e:57:cc:00",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "borderline-7-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:3d",
-      "interface": "InfiniBand",
-      "ip": "172.18.2.7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-7-ib0.bordeaux.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:3e",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.18.2.17",
-      "ip6": "fe80::260:ddff:fe47:8696",
-      "mac": "00:60:dd:47:86:96",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-7-myri0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.2.7",
-      "mac": "00:14:5e:57:cc:04",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "borderline-7-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4424000000,
-    "node_flops": 34880000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2599000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 8218",
-    "vendor": "AMD",
-    "version": 8218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "aacraid",
-      "interface": "SAS",
-      "model": "8k-l Stripe",
-      "rev": "V1.0",
-      "size": 586783129600,
-      "vendor": "ServeRA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "borderline-7"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
deleted file mode 100755
index b7c2ae16c27d68458521b55fb46957a6d01d28e0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 4,
-    "smt_size": 8
-  },
-  "bios": {
-    "release_date": "02/23/2007",
-    "vendor": "IBM",
-    "version": "-[ZYE129AUS-1.08]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3755 -[88774RG]-",
-    "serial": "99A3250"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 33878695936,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.2.8",
-      "ip6": "fe80::214:5eff:fe57:cbd8",
-      "mac": "00:14:5e:57:cb:d8",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-8.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sborderline",
-      "switch_port": null,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.5.8",
-      "mac": "00:14:5e:57:cb:d6",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "borderline-8-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:49",
-      "interface": "InfiniBand",
-      "ip": "172.18.2.8",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-8-ib0.bordeaux.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4a",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.18.2.18",
-      "ip6": "fe80::260:ddff:fe47:b514",
-      "mac": "00:60:dd:47:b5:14",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-8-myri0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.2.8",
-      "mac": "00:14:5e:57:cb:da",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "borderline-8-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4424000000,
-    "node_flops": 34880000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2599000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 8218",
-    "vendor": "AMD",
-    "version": 8218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "aacraid",
-      "interface": "SAS",
-      "model": "8k-l Stripe",
-      "rev": "V1.0",
-      "size": 586772643840,
-      "vendor": "ServeRA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "borderline-8"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
deleted file mode 100755
index e416dc1fb8ef684fc41703a74f293fc0993e5864..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 4,
-    "smt_size": 8
-  },
-  "bios": {
-    "release_date": "02/23/2007",
-    "vendor": "IBM",
-    "version": "-[ZYE129AUS-1.08]-"
-  },
-  "chassis": {
-    "manufacturer": "IBM",
-    "name": "IBM System x3755 -[88774RG]-",
-    "serial": "99A3253"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 33878695936,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.2.9",
-      "ip6": "fe80::214:5eff:fe57:cbae",
-      "mac": "00:14:5e:57:cb:ae",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-9.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sborderline",
-      "switch_port": null,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "ip": "172.16.5.9",
-      "mac": "00:14:5e:57:cb:ac",
-      "management": false,
-      "mountable": true,
-      "mounted": false,
-      "network_address": "borderline-9-eth1.bordeaux.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Broadcom",
-      "version": "NetXtreme II BCM5708"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1f:85",
-      "interface": "InfiniBand",
-      "ip": "172.18.2.9",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-9-ib0.bordeaux.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1f:86",
-      "interface": "InfiniBand",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT25418"
-    },
-    {
-      "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": true,
-      "interface": "Myrinet",
-      "ip": "172.18.2.19",
-      "ip6": "fe80::260:ddff:fe47:7d8c",
-      "mac": "00:60:dd:47:7d:8c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "borderline-9-myri0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Myrinet",
-      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.2.9",
-      "mac": "00:14:5e:57:cb:b0",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "borderline-9-bmc.bordeaux.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "kernel": "2.6.32-5-amd64",
-    "name": "debian",
-    "release": "Squeeze",
-    "version": "6.0.6"
-  },
-  "performance": {
-    "core_flops": 4424000000,
-    "node_flops": 34880000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2599000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 8218",
-    "vendor": "AMD",
-    "version": 8218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "aacraid",
-      "interface": "SAS",
-      "model": "8k-l Stripe",
-      "rev": "V1.0",
-      "size": 586783129600,
-      "vendor": "ServeRA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "borderline-9"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-0.8.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-0.8.json
deleted file mode 120000
index 30b0a480400b40905271d51043768003e62cde82..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-0.8.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.0.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.0.json
deleted file mode 120000
index 4237de0a7b36639570c43f50c38ec24eb5133603..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.1.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.1.json
deleted file mode 120000
index c5b51d7c9d54e88d9120f7c71e135189c73d2c42..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.2.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.2.json
deleted file mode 120000
index c0869933b95e0d1c2e649c85b86a198b779d07e3..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.2.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-1.2.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.3.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.3.json
deleted file mode 120000
index b9f85db57283899c867448460c6137e39434aa05..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.3.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.4.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.4.json
deleted file mode 120000
index b0289442e2a0448b08dcc926d53a838043404635..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.5.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.5.json
deleted file mode 120000
index a06e6ffc7de99174849b3360f93d250a5149e237..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.5.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-1.5.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.6.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.6.json
deleted file mode 120000
index 3fe1a3b68da7569755d9f0b3f93408d6cbe7d933..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.6.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-1.6.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.7.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.7.json
deleted file mode 120000
index 93b532e03d2c35fd4eb98d3ff3b037b052066724..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-1.7.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-1.7.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-0.8.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-0.8.json
deleted file mode 120000
index f651be05618dcb7f2b8a6e1a53624a164aef6984..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-0.8.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-0.9.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-0.9.json
deleted file mode 120000
index cfeca0cdca6e6b6754f27d2799f1730047c7b319..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-0.9.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-0.9.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.0.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.0.json
deleted file mode 120000
index ea1e939fffd7e68d62d8fedd3a052347e68e5bad..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.1.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.1.json
deleted file mode 120000
index 54b3c74abfe130d3674dae6c493123384bd20f38..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.2.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.2.json
deleted file mode 120000
index 8335a58e18c2d19ff5a27a6aefee7037ccafaf0e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.2.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.2.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.3.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.3.json
deleted file mode 120000
index facc299c50594acede751012f5560cf568cf2488..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.3.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.4.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.4.json
deleted file mode 120000
index 6b40f32a0c47c9e287611f9e26a3fbbf9ba4a49b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.5.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.5.json
deleted file mode 120000
index b0297bfe76de44920dc7c136008f1d2117b26b28..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.5.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.5.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.6.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.6.json
deleted file mode 120000
index 3afe03a17af18798ab80b45b87557362f5ea9c12..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.6.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.6.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.7.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.7.json
deleted file mode 120000
index 643bce3bfcf1dc3e5a4464dd0361089a824b1d95..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.7.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.7.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.8.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.8.json
deleted file mode 120000
index ea75ed20751c58f17d0f7507d23015a5485753c5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.8.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.9.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.9.json
deleted file mode 120000
index 7f2e7f23e7638b6b78e5412acd246f69ce2aca0b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-1.9.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.9.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-0.8.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-0.8.json
deleted file mode 120000
index 9006de5d2a4ceeebc8b7382fe52c6825a260994f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-0.8.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.0.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.0.json
deleted file mode 120000
index c87cea7f14fa10e76b3a2de2b5deb958083c1321..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.1.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.1.json
deleted file mode 120000
index 24b4e86fffcad3f408e207026940b4d8c7d9d7d8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.2.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.2.json
deleted file mode 120000
index 1385dfd20c460dfbb487a50c648a3117d912c538..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.2.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.2.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.3.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.3.json
deleted file mode 120000
index 247ef61ddaddeeb3a1fb726baa43e58780637c6c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.3.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.4.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.4.json
deleted file mode 120000
index f12ccbc39592160339ae4690cfc1dc1cd38cef76..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.5.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.5.json
deleted file mode 120000
index 1db75e4e157bb69e6f4be73ebd9a3e478221a271..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.5.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.5.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.6.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.6.json
deleted file mode 120000
index 6996278c81da5effe01fd26a4c2ca17b33c6b1ca..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.6.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.6.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.7.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.7.json
deleted file mode 120000
index 66896fe23346352c5e08b85e15540700b789d2b4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-1.7.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.7.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-0.8.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-0.8.json
deleted file mode 120000
index 5185a0bb1ddf7c35393027250bf6959b6fd4dee8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-0.8.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-0.9.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-0.9.json
deleted file mode 120000
index 75296a51cd62ef3921db8646b8a980cd557ae577..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-0.9.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-0.9.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.0.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.0.json
deleted file mode 120000
index d2665f4301f9b546a1e29721d7ea665a9a8cb54d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.1.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.1.json
deleted file mode 120000
index 26db54f58511478ba0eefa5a24b95b596c7c2e09..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.2.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.2.json
deleted file mode 120000
index 3cc8c5b46080d084846d09d1fe7862ff57e756c4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.2.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.2.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.3.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.3.json
deleted file mode 120000
index c6f1d46a09e4ea069d5d2736ea7e0346f4d25289..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.3.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.4.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.4.json
deleted file mode 120000
index 31cb91da4c8504ac8a133945eb61f56e14e2d22b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.5.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.5.json
deleted file mode 120000
index dfa2d1e3fc93fb6c1410456afc7bb9c242beae73..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.5.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.5.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.6.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.6.json
deleted file mode 120000
index a5f2990f4434a84b28605f8cc821d36a2028ad11..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.6.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.6.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.7.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.7.json
deleted file mode 120000
index 2e63ea6c05084cbdf35152301c553a4eb95c3977..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.7.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.7.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.8.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.8.json
deleted file mode 120000
index 42e41ccf94a84e178c01e77d049452d70a888c87..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.8.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.9.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.9.json
deleted file mode 120000
index 8adc74166423c2ac1d03dad27e87c7724e4f5ec9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-1.9.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.9.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-0.8.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-0.8.json
deleted file mode 120000
index 1812b44b1faddbc83cdeade8c1b7939e9b0918ae..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-0.8.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-0.9.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-0.9.json
deleted file mode 120000
index 4ef8eafce3171af7fa5a3309f882475b1700425b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-0.9.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-0.9.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.0.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.0.json
deleted file mode 120000
index ba6b153d7b070169707bb25b1eb25928ef9193fc..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.1.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.1.json
deleted file mode 120000
index 9215a5e98a51bc31ebc302bbed37e55ced164eec..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.2.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.2.json
deleted file mode 120000
index 109c625ea91985748cfcbc2a0ddf7ac13e6182eb..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.2.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-1.2.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.3.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.3.json
deleted file mode 120000
index 60a88db88efb096c50e9874773defffcc7c37a32..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.3.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.4.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.4.json
deleted file mode 120000
index 996fdd9858f5877634968cd57bdd3dc3e89de016..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.5.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.5.json
deleted file mode 120000
index 07735094ac8f0e3be622f5d887d54c0bc1747714..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.5.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-1.5.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.6.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.6.json
deleted file mode 120000
index 88e1c96af55e5ea49719f1dd953fdea6df97ece1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.6.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-1.6.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.7.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.7.json
deleted file mode 120000
index 9436b6c25a2b02834e53dbbb1cbaf1716aaa2bf4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-1.7.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-1.7.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/wheezy-x64-base-0.4.json b/data/grid5000/sites/bordeaux/environments/wheezy-x64-base-0.4.json
deleted file mode 120000
index ab33c013dee2a9b09e5e59e1fd60ffb84f854e11..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/wheezy-x64-base-0.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-base-0.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/wheezy-x64-base-1.0.json b/data/grid5000/sites/bordeaux/environments/wheezy-x64-base-1.0.json
deleted file mode 120000
index a0f49aad0f07a81f1f9e6c2caeb34a022280ed3c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/wheezy-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/wheezy-x64-base-1.1.json b/data/grid5000/sites/bordeaux/environments/wheezy-x64-base-1.1.json
deleted file mode 120000
index b05150cbc486c121e7a6fe1f8f15bad1f7e97a2c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/wheezy-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/wheezy-x64-big-0.4.json b/data/grid5000/sites/bordeaux/environments/wheezy-x64-big-0.4.json
deleted file mode 120000
index f68e26d86e8843f21db1d5046c683f015984e618..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/wheezy-x64-big-0.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-big-0.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/wheezy-x64-big-1.0.json b/data/grid5000/sites/bordeaux/environments/wheezy-x64-big-1.0.json
deleted file mode 120000
index a70a8e31d03f7c68d546aefb153bd4b8837e9f5c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/wheezy-x64-big-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-big-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/wheezy-x64-big-1.1.json b/data/grid5000/sites/bordeaux/environments/wheezy-x64-big-1.1.json
deleted file mode 120000
index 96227166e75094dc717ef004dc668f643da2cd73..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/wheezy-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/wheezy-x64-min-0.4.json b/data/grid5000/sites/bordeaux/environments/wheezy-x64-min-0.4.json
deleted file mode 120000
index 18b7f38686658a9787a1656f4f1f9e11c98114d1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/wheezy-x64-min-0.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-min-0.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/wheezy-x64-min-1.0.json b/data/grid5000/sites/bordeaux/environments/wheezy-x64-min-1.0.json
deleted file mode 120000
index cbff65a13fde80d2d275993f80ab342c828b7abd..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/wheezy-x64-min-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-min-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/wheezy-x64-min-1.1.json b/data/grid5000/sites/bordeaux/environments/wheezy-x64-min-1.1.json
deleted file mode 120000
index 04e2901084eb0123cbb7aab32f7da335f7ac7665..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/wheezy-x64-min-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-min-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/wheezy-x64-nfs-0.4.json b/data/grid5000/sites/bordeaux/environments/wheezy-x64-nfs-0.4.json
deleted file mode 120000
index 0922998b03025cc207e6604d22ef2d36430bc6a1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/wheezy-x64-nfs-0.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-nfs-0.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/wheezy-x64-nfs-1.0.json b/data/grid5000/sites/bordeaux/environments/wheezy-x64-nfs-1.0.json
deleted file mode 120000
index 29cd14904d401b0fd45c0672fa365930afcc15d9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/wheezy-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/wheezy-x64-nfs-1.1.json b/data/grid5000/sites/bordeaux/environments/wheezy-x64-nfs-1.1.json
deleted file mode 120000
index cc41493ccfc1f88e440abe7ea633964a84bd2f83..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/wheezy-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/wheezy-x64-xen-0.4.json b/data/grid5000/sites/bordeaux/environments/wheezy-x64-xen-0.4.json
deleted file mode 120000
index d6df651aae17cb44a5b0781d150e2b7092c4ef26..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/wheezy-x64-xen-0.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-xen-0.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/wheezy-x64-xen-1.0.json b/data/grid5000/sites/bordeaux/environments/wheezy-x64-xen-1.0.json
deleted file mode 120000
index fb8c4e7c352ecf85449ecc46daae929b1297a79d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/wheezy-x64-xen-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-xen-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/wheezy-x64-xen-1.1.json b/data/grid5000/sites/bordeaux/environments/wheezy-x64-xen-1.1.json
deleted file mode 120000
index 4e74cde4c3d2a134d4c37b630455986c52dd52a4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/wheezy-x64-xen-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-xen-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/network_equipments/gw-bordeaux.json b/data/grid5000/sites/bordeaux/network_equipments/gw-bordeaux.json
deleted file mode 100644
index 4d54fea5e7a6868cc1ec51f546fcb4ceb14597bf..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/network_equipments/gw-bordeaux.json
+++ /dev/null
@@ -1,462 +0,0 @@
-{
-  "backplane_bps": 346000000000,
-  "channels": {
-    "naming_pattern": "Po%CHANNELID%"
-  },
-  "kind": "router",
-  "linecards": [
-    {
-
-    },
-    {
-      "backplane_bps": 14400000000,
-      "kind": "switch",
-      "model": "J8707A",
-      "naming_pattern": "%LINECARD:A%%PORT%",
-      "ports": [
-        {
-
-        },
-        {
-          "kind": "switch",
-          "uid": "sborderline"
-        },
-        {
-
-        },
-        {
-          "kind": "virtual",
-          "uid": "renater-bordeaux"
-        },
-        {
-          "kind": "other",
-          "port": "eth0",
-          "uid": "storage"
-        }
-      ],
-      "rate": 10000000000
-    },
-    {
-      "backplane_bps": 14400000000,
-      "kind": "node",
-      "model": "J8705A",
-      "naming_pattern": "%LINECARD:A%%PORT%",
-      "ports": [
-        {
-
-        },
-        {
-          "uid": "bordereau-1"
-        },
-        {
-          "uid": "bordereau-2"
-        },
-        {
-          "uid": "bordereau-3"
-        },
-        {
-          "uid": "bordereau-4"
-        },
-        {
-          "uid": "bordereau-5"
-        },
-        {
-          "uid": "bordereau-6"
-        },
-        {
-          "uid": "bordereau-7"
-        },
-        {
-          "uid": "bordereau-8"
-        },
-        {
-          "uid": "bordereau-9"
-        },
-        {
-          "uid": "bordereau-10"
-        },
-        {
-          "uid": "bordereau-11"
-        },
-        {
-          "uid": "bordereau-12"
-        },
-        {
-          "uid": "bordereau-13"
-        },
-        {
-          "uid": "bordereau-14"
-        },
-        {
-          "uid": "bordereau-15"
-        },
-        {
-          "uid": "bordereau-16"
-        },
-        {
-          "uid": "bordereau-17"
-        },
-        {
-          "uid": "bordereau-18"
-        },
-        {
-          "uid": "bordereau-19"
-        },
-        {
-          "uid": "bordereau-20"
-        },
-        {
-          "uid": "bordereau-21"
-        },
-        {
-          "uid": "bordereau-22"
-        },
-        {
-          "uid": "bordereau-23"
-        },
-        {
-          "uid": "bordereau-24"
-        }
-      ],
-      "rate": 100000000
-    },
-    {
-      "backplane_bps": 14400000000,
-      "kind": "node",
-      "model": "J8702A",
-      "naming_pattern": "%LINECARD:A%%PORT%",
-      "ports": [
-        {
-
-        },
-        {
-          "uid": "bordereau-25"
-        },
-        {
-          "uid": "bordereau-26"
-        },
-        {
-          "uid": "bordereau-27"
-        },
-        {
-          "uid": "bordereau-28"
-        },
-        {
-          "uid": "bordereau-29"
-        },
-        {
-          "uid": "bordereau-30"
-        },
-        {
-          "uid": "bordereau-31"
-        },
-        {
-          "uid": "bordereau-32"
-        },
-        {
-          "uid": "bordereau-33"
-        },
-        {
-          "uid": "bordereau-34"
-        },
-        {
-          "uid": "bordereau-35"
-        },
-        {
-          "uid": "bordereau-36"
-        },
-        {
-          "uid": "bordereau-37"
-        },
-        {
-          "uid": "bordereau-38"
-        },
-        {
-          "uid": "bordereau-39"
-        },
-        {
-          "uid": "bordereau-40"
-        },
-        {
-          "uid": "bordereau-41"
-        },
-        {
-          "uid": "bordereau-42"
-        },
-        {
-          "uid": "bordereau-43"
-        },
-        {
-          "uid": "bordereau-44"
-        },
-        {
-          "uid": "bordereau-45"
-        },
-        {
-          "uid": "bordereau-46"
-        },
-        {
-          "uid": "bordereau-47"
-        },
-        {
-          "uid": "bordereau-48"
-        }
-      ],
-      "rate": 100000000
-    },
-    {
-      "backplane_bps": 14400000000,
-      "kind": "node",
-      "model": "J8702A",
-      "naming_pattern": "%LINECARD:A%%PORT%",
-      "ports": [
-        {
-
-        },
-        {
-          "uid": "bordereau-49"
-        },
-        {
-          "uid": "bordereau-50"
-        },
-        {
-          "uid": "bordereau-51"
-        },
-        {
-          "uid": "bordereau-52"
-        },
-        {
-          "uid": "bordereau-53"
-        },
-        {
-          "uid": "bordereau-54"
-        },
-        {
-          "uid": "bordereau-55"
-        },
-        {
-          "uid": "bordereau-56"
-        },
-        {
-          "uid": "bordereau-57"
-        },
-        {
-          "uid": "bordereau-58"
-        },
-        {
-          "uid": "bordereau-59"
-        },
-        {
-          "uid": "bordereau-60"
-        },
-        {
-          "uid": "bordereau-61"
-        },
-        {
-          "uid": "bordereau-62"
-        },
-        {
-          "uid": "bordereau-63"
-        },
-        {
-          "uid": "bordereau-64"
-        },
-        {
-          "uid": "bordereau-65"
-        },
-        {
-          "uid": "bordereau-66"
-        },
-        {
-          "uid": "bordereau-67"
-        },
-        {
-          "uid": "bordereau-68"
-        },
-        {
-          "uid": "bordereau-69"
-        },
-        {
-          "uid": "bordereau-70"
-        },
-        {
-          "uid": "bordereau-71"
-        },
-        {
-          "uid": "bordereau-72"
-        }
-      ],
-      "rate": 100000000
-    },
-    {
-      "backplane_bps": 14400000000,
-      "kind": "node",
-      "model": "J8702A",
-      "naming_pattern": "%LINECARD:A%%PORT%",
-      "ports": [
-        {
-
-        },
-        {
-          "uid": "bordereau-73"
-        },
-        {
-          "uid": "bordereau-74"
-        },
-        {
-          "uid": "bordereau-75"
-        },
-        {
-          "uid": "bordereau-76"
-        },
-        {
-          "uid": "bordereau-77"
-        },
-        {
-          "uid": "bordereau-78"
-        },
-        {
-          "uid": "bordereau-79"
-        },
-        {
-          "uid": "bordereau-80"
-        },
-        {
-          "uid": "bordereau-81"
-        },
-        {
-          "uid": "bordereau-82"
-        },
-        {
-          "uid": "bordereau-83"
-        },
-        {
-          "uid": "bordereau-84"
-        },
-        {
-          "uid": "bordereau-85"
-        },
-        {
-          "uid": "bordereau-86"
-        },
-        {
-          "uid": "bordereau-87"
-        },
-        {
-          "uid": "bordereau-88"
-        },
-        {
-          "uid": "bordereau-89"
-        },
-        {
-          "uid": "bordereau-90"
-        },
-        {
-          "uid": "bordereau-91"
-        },
-        {
-          "uid": "bordereau-92"
-        },
-        {
-          "uid": "bordereau-93"
-        }
-      ],
-      "rate": 100000000
-    },
-    {
-      "backplane_bps": 14400000000,
-      "kind": "other",
-      "model": "J8702A",
-      "naming_pattern": "%LINECARD:A%%PORT%",
-      "ports": [
-        {
-
-        },
-        {
-          "port": "eth0",
-          "uid": "xen-srv1"
-        },
-        {
-          "port": "eth1",
-          "uid": "xen-srv1"
-        },
-        {
-          "port": "eth0",
-          "uid": "xen-srv2"
-        },
-        {
-          "port": "eth1",
-          "uid": "xen-srv2"
-        },
-        {
-          "port": "eth0",
-          "uid": "borderline"
-        },
-        {
-          "port": "eth1",
-          "uid": "borderline"
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-          "kind": "switch",
-          "uid": "mx-borderline"
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-          "kind": "virtual",
-          "rate": 1000000000,
-          "uid": "LaBRI"
-        },
-        {
-          "kind": "switch",
-          "uid": "ib-borderline"
-        },
-        {
-          "kind": "switch",
-          "uid": "st-bordemer"
-        }
-      ],
-      "rate": 100000000
-    }
-  ],
-  "model": "HP Procurve 5406zl J8697A",
-  "mtu": 9220,
-  "routes": {
-
-  },
-  "site": "bordeaux",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "gw-bordeaux",
-  "vlans": {
-    "naming_pattern": "Vlan%VLANID%",
-    "vlan1": {
-      "addresses": [
-        "172.16.15.254"
-      ],
-      "administrative": true
-    }
-  },
-  "weathermap": {
-
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/network_equipments/ib-bdx.json b/data/grid5000/sites/bordeaux/network_equipments/ib-bdx.json
deleted file mode 100644
index 50cc04d5992156c666e5c4e4f08a3854be2da130..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/network_equipments/ib-bdx.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "channels": {
-    "naming_pattern": "Po%CHANNELID%"
-  },
-  "kind": "switch",
-  "linecards": [
-    {
-      "kind": "router",
-      "naming_pattern": "%LINECARD%/%PORT%",
-      "ports": [
-        {
-          "uid": "gw-bordeaux"
-        }
-      ],
-      "rate": 10000000000
-    }
-  ],
-  "model": "Infiniband",
-  "routes": {
-
-  },
-  "site": "bordeaux",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "ib-bdx",
-  "vlans": {
-    "naming_pattern": "Vlan%VLANID%"
-  },
-  "weathermap": {
-    "use_cacti": "no"
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/network_equipments/ib-borderline.json b/data/grid5000/sites/bordeaux/network_equipments/ib-borderline.json
deleted file mode 100644
index 5f061012c2aacba1df980ec3a63c4b3f22402aee..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/network_equipments/ib-borderline.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "backplane_bps": null,
-  "channels": {
-    "naming_pattern": "Po%CHANNELID%"
-  },
-  "kind": "switch",
-  "linecards": [
-    {
-      "kind": "router",
-      "naming_pattern": "%LINECARD%/%PORT%",
-      "ports": [
-        {
-          "uid": "gw-bordeaux"
-        }
-      ],
-      "rate": 10000000000
-    }
-  ],
-  "model": "Infiniband",
-  "mtu": null,
-  "routes": {
-
-  },
-  "site": "bordeaux",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "ib-borderline",
-  "vlans": {
-    "naming_pattern": "Vlan%VLANID%"
-  },
-  "weathermap": {
-    "use_cacti": "no"
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/network_equipments/mx-bdx.json b/data/grid5000/sites/bordeaux/network_equipments/mx-bdx.json
deleted file mode 100644
index 005e293660ae73f3caffc8c7f3632afeecf5905c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/network_equipments/mx-bdx.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "channels": {
-    "naming_pattern": "Po%CHANNELID%"
-  },
-  "kind": "switch",
-  "linecards": [
-    {
-      "kind": "router",
-      "naming_pattern": "%LINECARD%/%PORT%",
-      "ports": [
-        {
-          "uid": "gw-bordeaux"
-        }
-      ],
-      "rate": 10000000000
-    }
-  ],
-  "model": "Myrinet",
-  "routes": {
-
-  },
-  "site": "bordeaux",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "mx-bdx",
-  "vlans": {
-    "naming_pattern": "Vlan%VLANID%"
-  },
-  "weathermap": {
-    "use_cacti": "no"
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/network_equipments/mx-borderline.json b/data/grid5000/sites/bordeaux/network_equipments/mx-borderline.json
deleted file mode 100644
index 2a074dc1cb6fd87ce164f97ac310e96af63b2de8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/network_equipments/mx-borderline.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "backplane_bps": null,
-  "channels": {
-    "naming_pattern": "Po%CHANNELID%"
-  },
-  "kind": "switch",
-  "linecards": [
-    {
-      "kind": "router",
-      "naming_pattern": "%LINECARD%/%PORT%",
-      "ports": [
-        {
-          "uid": "gw-bordeaux"
-        }
-      ],
-      "rate": 10000000000
-    }
-  ],
-  "model": "Myrinet",
-  "mtu": null,
-  "routes": {
-
-  },
-  "site": "bordeaux",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "mx-borderline",
-  "vlans": {
-    "naming_pattern": "Vlan%VLANID%"
-  },
-  "weathermap": {
-    "use_cacti": "no"
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/network_equipments/sbordeplage1.json b/data/grid5000/sites/bordeaux/network_equipments/sbordeplage1.json
deleted file mode 100644
index 8dd637c9928d11e9d52c0b813fc718d4323435d8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/network_equipments/sbordeplage1.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "backplane_bps": null,
-  "channels": {
-    "naming_pattern": "Po%CHANNELID%"
-  },
-  "kind": "switch",
-  "linecards": [
-    {
-      "kind": "switch",
-      "naming_pattern": "%LINECARD%/%PORT%",
-      "ports": [
-        {
-          "uid": "st-bordemer"
-        },
-        {
-          "uid": "dinkum-thinkum"
-        }
-      ],
-      "rate": 1000000000
-    },
-    {
-      "kind": "node",
-      "naming_pattern": "%LINECARD%/%PORT%",
-      "ports": [
-        {
-
-        },
-        {
-          "uid": "bordeplage-1"
-        },
-        {
-          "uid": "bordeplage-2"
-        },
-        {
-          "uid": "bordeplage-3"
-        },
-        {
-          "uid": "bordeplage-4"
-        },
-        {
-          "uid": "bordeplage-5"
-        },
-        {
-          "uid": "bordeplage-6"
-        },
-        {
-          "uid": "bordeplage-7"
-        },
-        {
-          "uid": "bordeplage-8"
-        },
-        {
-          "uid": "bordeplage-9"
-        },
-        {
-          "uid": "bordeplage-10"
-        }
-      ],
-      "rate": 1000000000
-    }
-  ],
-  "model": "PowerConnect 5324",
-  "mtu": 8192,
-  "routes": {
-
-  },
-  "site": "bordeaux",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "sbordeplage1",
-  "vlans": {
-    "naming_pattern": "Vlan%VLANID%",
-    "vlan100": {
-      "addresses": [
-        "172.16.15.201"
-      ],
-      "administrative": true
-    }
-  },
-  "weathermap": {
-    "use_cacti": "no"
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/network_equipments/sbordeplage2.json b/data/grid5000/sites/bordeaux/network_equipments/sbordeplage2.json
deleted file mode 100644
index 77ae6978e25b74fdd5763e4cc53d42ceead38969..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/network_equipments/sbordeplage2.json
+++ /dev/null
@@ -1,173 +0,0 @@
-{
-  "backplane_bps": null,
-  "channels": {
-    "naming_pattern": "Po%CHANNELID%"
-  },
-  "kind": "switch",
-  "linecards": [
-    {
-      "kind": "switch",
-      "naming_pattern": "%LINECARD%/%PORT%",
-      "ports": [
-        {
-          "uid": "st-bordemer"
-        }
-      ],
-      "rate": 1000000000
-    },
-    {
-      "kind": "node",
-      "naming_pattern": "%LINECARD%/%PORT%",
-      "ports": [
-        {
-
-        },
-        {
-          "uid": "bordeplage-11"
-        },
-        {
-          "uid": "bordeplage-12"
-        },
-        {
-          "uid": "bordeplage-13"
-        },
-        {
-          "uid": "bordeplage-14"
-        },
-        {
-          "uid": "bordeplage-15"
-        },
-        {
-          "uid": "bordeplage-16"
-        },
-        {
-          "uid": "bordeplage-17"
-        },
-        {
-          "uid": "bordeplage-18"
-        },
-        {
-          "uid": "bordeplage-19"
-        },
-        {
-          "uid": "bordeplage-20"
-        },
-        {
-          "uid": "bordeplage-21"
-        },
-        {
-          "uid": "bordeplage-22"
-        },
-        {
-          "uid": "bordeplage-23"
-        },
-        {
-          "uid": "bordeplage-24"
-        },
-        {
-          "uid": "bordeplage-25"
-        },
-        {
-          "uid": "bordeplage-26"
-        },
-        {
-          "uid": "bordeplage-27"
-        },
-        {
-          "uid": "bordeplage-28"
-        },
-        {
-          "uid": "bordeplage-29"
-        },
-        {
-          "uid": "bordeplage-30"
-        },
-        {
-          "uid": "bordeplage-31"
-        },
-        {
-          "uid": "bordeplage-32"
-        },
-        {
-          "uid": "bordeplage-33"
-        },
-        {
-          "uid": "bordeplage-34"
-        },
-        {
-          "uid": "bordeplage-35"
-        },
-        {
-          "uid": "bordeplage-36"
-        },
-        {
-          "uid": "bordeplage-37"
-        },
-        {
-          "uid": "bordeplage-38"
-        },
-        {
-          "uid": "bordeplage-39"
-        },
-        {
-          "uid": "bordeplage-40"
-        },
-        {
-          "uid": "bordeplage-41"
-        },
-        {
-          "uid": "bordeplage-42"
-        },
-        {
-          "uid": "bordeplage-43"
-        },
-        {
-          "uid": "bordeplage-44"
-        },
-        {
-          "uid": "bordeplage-45"
-        },
-        {
-          "uid": "bordeplage-46"
-        },
-        {
-          "uid": "bordeplage-47"
-        },
-        {
-          "uid": "bordeplage-48"
-        },
-        {
-          "uid": "bordeplage-49"
-        },
-        {
-          "uid": "bordeplage-50"
-        },
-        {
-          "uid": "bordeplage-51"
-        }
-      ],
-      "rate": 1000000000
-    }
-  ],
-  "model": "PowerConnect 3424",
-  "mtu": 9216,
-  "routes": {
-
-  },
-  "site": "bordeaux",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "sbordeplage2",
-  "vlans": {
-    "naming_pattern": "Vlan%VLANID%",
-    "vlan100": {
-      "addresses": [
-        "172.16.15.202"
-      ],
-      "administrative": true
-    }
-  },
-  "weathermap": {
-    "use_cacti": "no"
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/network_equipments/sborderline.json b/data/grid5000/sites/bordeaux/network_equipments/sborderline.json
deleted file mode 100644
index 29928673d0bbddd6d05338c60aaafe4da24dff1b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/network_equipments/sborderline.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "backplane_bps": null,
-  "channels": {
-    "naming_pattern": "Po%CHANNELID%"
-  },
-  "kind": "switch",
-  "linecards": [
-    {
-      "kind": "router",
-      "naming_pattern": "%LINECARD%/%PORT%",
-      "ports": [
-        {
-          "uid": "gw-bordeaux"
-        }
-      ],
-      "rate": 10000000000
-    },
-    {
-      "kind": "node",
-      "naming_pattern": "%LINECARD%/%PORT%",
-      "ports": [
-        {
-
-        },
-        {
-          "uid": "borderline-1"
-        },
-        {
-          "uid": "borderline-2"
-        },
-        {
-          "uid": "borderline-3"
-        },
-        {
-          "uid": "borderline-4"
-        },
-        {
-          "uid": "borderline-5"
-        },
-        {
-          "uid": "borderline-6"
-        },
-        {
-          "uid": "borderline-7"
-        },
-        {
-          "uid": "borderline-8"
-        },
-        {
-          "uid": "borderline-9"
-        },
-        {
-          "uid": "borderline-10"
-        }
-      ],
-      "rate": 1000000000
-    }
-  ],
-  "model": "Nortel 5530",
-  "mtu": 9600,
-  "routes": {
-
-  },
-  "site": "bordeaux",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "sborderline",
-  "vlans": {
-    "naming_pattern": "Vlan%VLANID%"
-  },
-  "weathermap": {
-    "use_cacti": "no"
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/network_equipments/st-bordemer.json b/data/grid5000/sites/bordeaux/network_equipments/st-bordemer.json
deleted file mode 100644
index 45a167d879f4c6afae30e31942d6295f7aa69781..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/network_equipments/st-bordemer.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "backplane_bps": null,
-  "channels": {
-    "naming_pattern": "Po%CHANNELID%"
-  },
-  "kind": "switch",
-  "linecards": [
-    {
-
-    },
-    {
-      "kind": "router",
-      "naming_pattern": "Gi%LINECARD%/0/%PORT%",
-      "ports": [
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-          "uid": "gw-bordeaux"
-        }
-      ],
-      "rate": 1000000000
-    }
-  ],
-  "model": "Cisco WS-C3750G-24TS",
-  "mtu": 9000,
-  "routes": {
-
-  },
-  "site": "bordeaux",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "st-bordemer",
-  "vlans": {
-    "naming_pattern": "Vlan%VLANID%",
-    "vlan100": {
-      "addresses": [
-        "172.16.15.200"
-      ],
-      "administrative": true
-    }
-  },
-  "weathermap": {
-
-  }
-}
\ No newline at end of file
diff --git a/generators/input/sites/bordeaux/bordeaux.rb b/generators/input/sites/bordeaux/bordeaux.rb
deleted file mode 100644
index 0a670df52a0f3e641dac5d7e964e074539d04924..0000000000000000000000000000000000000000
--- a/generators/input/sites/bordeaux/bordeaux.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-site :bordeaux do |site_uid|
-  name "Bordeaux"
-  location "Bordeaux, France"
-  web "http://www.grid5000.fr/mediawiki/index.php/Bordeaux:Home"
-  description "Grid5000 Bordeaux site"
-  latitude 44.833333
-  longitude -0.566667
-  email_contact "support-staff@lists.grid5000.fr"
-  sys_admin_contact "support-staff@lists.grid5000.fr"
-  security_contact "support-staff@lists.grid5000.fr"
-  user_support_contact "support-staff@lists.grid5000.fr"
-  compilation_server false
-  kavlan_ip_range "10.0.0.0/14"
-  virt_ip_plage "10.128.0.0/14"
-end
diff --git a/generators/input/sites/bordeaux/clusters/bordeplage.rb b/generators/input/sites/bordeaux/clusters/bordeplage.rb
deleted file mode 100644
index adb59fd226665861d08941a82f28f450972de992..0000000000000000000000000000000000000000
--- a/generators/input/sites/bordeaux/clusters/bordeplage.rb
+++ /dev/null
@@ -1,164 +0,0 @@
-site :bordeaux do |site_uid|
-
-  cluster :bordeplage do |cluster_uid|
-    model "Dell PowerEdge 1855"
-    kavlan false
-    created_at nil
-
-    51.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 4820000000,
-        :node_flops => 9000000000
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup('bordeplage_generated', node_uid, 'supported_job_types', 'virtual')
-        })
-
-        architecture({
-          :smp_size       => lookup('bordeplage_generated', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('bordeplage_generated', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('bordeplage_generated', node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup('bordeplage_generated', node_uid, 'processor', 'vendor'),
-          :model              => lookup('bordeplage_generated', node_uid, 'processor', 'model'),
-          :version            => lookup('bordeplage_generated', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('bordeplage_generated', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('bordeplage_generated', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('bordeplage_generated', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('bordeplage_generated', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('bordeplage_generated', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('bordeplage_generated', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('bordeplage_generated', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('bordeplage_generated', node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup('bordeplage_generated', node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => lookup('bordeplage_generated', node_uid, 'operating_system', 'name'),
-          :release  => "Squeeze",
-          :version  => lookup('bordeplage_generated', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('bordeplage_generated', node_uid, 'operating_system', 'kernel')
-        })
-
-        storage_devices [{
-          :interface  => 'SCSI',
-          :size       => lookup('bordeplage_generated', node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "mptspi",
-          :device     => lookup('bordeplage_generated', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('bordeplage_generated', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('bordeplage_generated', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('bordeplage_generated', node_uid, 'block_devices', 'sda', 'rev')
-        }]
-
-        network_adapters [{
-          :interface        => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor 	    => "Intel",
-          :version 	    => "82546GB Gigabit Ethernet Controller",
-          :driver           => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => "sbordeplage",
-          :switch_port      => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor 	    => "Intel",
-          :version 	    => "82546GB Gigabit Ethernet Controller",
-          :network_address  => "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
-          :ip               => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :driver           => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'rate'),
-          :device           => "ib0",
-          :enabled          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'mounted'),
-          :vendor           => 'Mellanox',
-          :version          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'version'),
-          :driver           => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'driver'),
-          :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :ip6              => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :guid             => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'guid')
-        },
-        {
-          :interface        => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib1', 'interface'),
-          :rate             => 10.G,
-          :device           => "ib1",
-          :enabled          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib1', 'enabled'),
-          :management       => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib1', 'management'),
-          :mountable        => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib1', 'mountable'),
-          :mounted          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib1', 'mounted'),
-          :vendor           => 'Mellanox',
-          :version          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib1', 'version'),
-          :driver           => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib1', 'driver'),
-          :guid             => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib1', 'guid')
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 100.M,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc"
-        }]
-
-        chassis({
-          :serial       => lookup('bordeplage_generated', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('bordeplage_generated', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('bordeplage_generated', node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup('bordeplage_generated', node_uid, 'bios', 'version'),
-          :vendor       => lookup('bordeplage_generated', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('bordeplage_generated', node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-        monitoring({
-          :wattmeter  => false
-        })
-      end
-    end
-  end # cluster bordeplage
-  #misc "Motherboard Bios version: A05 ;IPMI version 1.5: Firware revision 1.6"
-end
diff --git a/generators/input/sites/bordeaux/clusters/bordeplage_generated.yaml b/generators/input/sites/bordeaux/clusters/bordeplage_generated.yaml
deleted file mode 100644
index a0a2524225f0b15a90224f9599b04203a97f4e09..0000000000000000000000000000000000000000
--- a/generators/input/sites/bordeaux/clusters/bordeplage_generated.yaml
+++ /dev/null
@@ -1,4387 +0,0 @@
----
-bordeplage-1:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:9d:56
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.1
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:9d:57
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:d9:ec
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.1
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:d9:ed
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.1
-    bmc:
-      mac: 00:14:22:0c:d9:ec
-      ip: 172.17.0.1
-  chassis:
-    serial_number: 6PFGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-2:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:25
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.2
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:26
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:46
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.2
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:47
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.2
-    bmc:
-      mac: 00:14:22:0c:da:46
-      ip: 172.17.0.2
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 725GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-3:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:72
-      rate: 10000000000
-      ip6: fe80::205:ad00:2:b472
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.3
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:73
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:66
-      ip6: fe80::214:22ff:fe0c:e166
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.3
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:67
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.3
-    bmc:
-      mac: 00:14:22:0c:e1:66
-      ip: 172.17.0.3
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 9KMGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  main_memory:
-    ram_size: 2109562880
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-4:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e9
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:61e9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.4
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ea
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:d9:fa
-      ip6: fe80::214:22ff:fe0c:d9fa
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.4
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:d9:fb
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.4
-    bmc:
-      mac: 00:14:22:0c:d9:fa
-      ip: 172.17.0.4
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 7D5GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-5:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:b5
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.5
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:b6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:74
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.5
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:75
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.5
-    bmc:
-      mac: 00:14:22:0c:e1:74
-      ip: 172.17.0.5
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 725GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-6:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:39
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.6
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:3a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:6e
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.6
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:6f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.6
-    bmc:
-      mac: 00:14:22:0c:da:6e
-      ip: 172.17.0.6
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 725GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-7:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:4e
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.7
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:4f
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:44
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.7
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:45
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.7
-    bmc:
-      mac: 00:14:22:0c:e1:44
-      ip: 172.17.0.7
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 725GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-8:
-  bios:
-    version: A03
-    release_date: 05/12/2005
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:aa:80
-      rate: 10000000000
-      ip6: fe80::205:ad00:2:aa80
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.8
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:aa:81
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:40
-      ip6: fe80::214:22ff:fe0c:da40
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.8
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:41
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.8
-    bmc:
-      mac: 00:14:22:0c:da:40
-      ip: 172.17.0.8
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 5PFGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-9:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:80
-      rate: 10000000000
-      ip6: fe80::205:ad00:2:a580
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.9
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:81
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:50
-      ip6: fe80::214:22ff:fe0c:da50
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.9
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:51
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.9
-    bmc:
-      mac: 00:14:22:0c:da:50
-      ip: 172.17.0.9
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 2QFGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-10:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:76
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.10
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:77
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.10
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.10
-    bmc:
-      mac: 00:14:22:0c:da:76
-      ip: 172.17.0.10
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 725GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-11:
-  bios:
-    version: A03
-    release_date: 05/12/2005
-    vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:2a
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.11
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:2b
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:d9:bc
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.11
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:d9:bd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.11
-    bmc:
-      mac: 00:14:22:0c:d9:bc
-      ip: 172.17.0.11
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: FC5GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-12:
-  bios:
-    version: A03
-    release_date: 05/12/2005
-    vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3e
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a3e
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.12
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3f
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:74
-      ip6: fe80::214:22ff:fe0c:da74
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.12
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:75
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.12
-    bmc:
-      mac: 00:14:22:0c:da:74
-      ip: 172.17.0.12
-  chassis:
-    serial_number: 2D5GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  main_memory:
-    ram_size: 2110054400
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-13:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:7b
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.13
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:7c
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:82
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.13
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:83
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.13
-    bmc:
-      mac: 00:14:22:0c:da:82
-      ip: 172.17.0.13
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 725GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-14:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:52
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a52
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.14
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:53
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:90
-      ip6: fe80::214:22ff:fe0c:da90
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.14
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:91
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.14
-    bmc:
-      mac: 00:14:22:0c:da:90
-      ip: 172.17.0.14
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: HC5GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  main_memory:
-    ram_size: 2109562880
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-15:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:41
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:6241
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.15
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:42
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:c0
-      ip6: fe80::214:22ff:fe0c:dac0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.15
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:c1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.15
-    bmc:
-      mac: 00:14:22:0c:da:c0
-      ip: 172.17.0.15
-  chassis:
-    serial_number: 2PFGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-16:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:74
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.16
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:75
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:44
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.16
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:45
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.16
-    bmc:
-      mac: 00:14:22:0c:da:44
-      ip: 172.17.0.16
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 725GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-17:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:c5
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.17
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:c6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:62
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.17
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:63
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.17
-    bmc:
-      mac: 00:14:22:0c:da:62
-      ip: 172.17.0.17
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 725GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-18:
-  bios:
-    version: A03
-    release_date: 05/12/2005
-    vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:09
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.18
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:0a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:a2
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.18
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:a3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.18
-    bmc:
-      mac: 00:14:22:0c:da:a2
-      ip: 172.17.0.18
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: 335GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  main_memory:
-    ram_size: 2109562880
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-19:
-  bios:
-    version: A03
-    release_date: 05/12/2005
-    vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b5
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:62b5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.19
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:b4:00
-      ip6: fe80::214:22ff:fe0c:b400
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.19
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:b4:01
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.19
-    bmc:
-      mac: 00:14:22:0c:b4:00
-      ip: 172.17.0.19
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: B35GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2110054400
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-20:
-  bios:
-    version: A03
-    release_date: 05/12/2005
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b9
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:62b9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.20
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:ba
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:b3:1c
-      ip6: fe80::214:22ff:fe0c:b31c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.20
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:b3:1d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.20
-    bmc:
-      mac: 00:14:22:0c:b3:1c
-      ip: 172.17.0.20
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: 331KV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  main_memory:
-    ram_size: 2110054400
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-21:
-  bios:
-    version: A03
-    release_date: 05/12/2005
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:1a
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a1a
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.21
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:1b
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:48
-      ip6: fe80::214:22ff:fe0c:e148
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.21
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:49
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.21
-    bmc:
-      mac: 00:14:22:0c:e1:48
-      ip: 172.17.0.21
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  chassis:
-    serial_number: DKMGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  main_memory:
-    ram_size: 2110054400
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-22:
-  bios:
-    version: A03
-    release_date: 05/12/2005
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:42
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a42
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.22
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:43
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:dd:02
-      ip6: fe80::214:22ff:fe0c:dd02
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.22
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:dd:03
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.22
-    bmc:
-      mac: 00:14:22:0c:dd:02
-      ip: 172.17.0.22
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  chassis:
-    serial_number: JMZGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2110054400
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-23:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:89
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.23
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:8a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:4c
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.23
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:4d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.23
-    bmc:
-      mac: 00:14:22:0c:e1:4c
-      ip: 172.17.0.23
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 725GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-24:
-  bios:
-    version: A03
-    release_date: 05/12/2005
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ed
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:61ed
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.24
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ee
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:e0:e0
-      ip6: fe80::214:22ff:fe0c:e0e0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.24
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:e0:e1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.24
-    bmc:
-      mac: 00:14:22:0c:e0:e0
-      ip: 172.17.0.24
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: 1NZGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2110054400
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-25:
-  bios:
-    version: A03
-    release_date: 05/12/2005
-    vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a4:4b
-      rate: 10000000000
-      ip6: fe80::205:ad00:2:a44b
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.25
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a4:4c
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:76
-      ip6: fe80::214:22ff:fe0c:e176
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.25
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:77
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.25
-    bmc:
-      mac: 00:14:22:0c:e1:76
-      ip: 172.17.0.25
-  chassis:
-    serial_number: 9LZGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  main_memory:
-    ram_size: 2110054400
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-26:
-  bios:
-    version: A03
-    release_date: 05/12/2005
-    vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:95
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:6295
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.26
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:96
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:52
-      ip6: fe80::214:22ff:fe0c:e152
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.26
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:53
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.26
-    bmc:
-      mac: 00:14:22:0c:e1:52
-      ip: 172.17.0.26
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 3MZGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2110054400
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-27:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:56
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.27
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:57
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:7e
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.27
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:7f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.27
-    bmc:
-      mac: 00:14:22:0c:e1:7e
-      ip: 172.17.0.27
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 725GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-28:
-  bios:
-    version: A03
-    release_date: 05/12/2005
-    vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:99
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:6299
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.28
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:9a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:8c
-      ip6: fe80::214:22ff:fe0c:e18c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.28
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:8d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.28
-    bmc:
-      mac: 00:14:22:0c:e1:8c
-      ip: 172.17.0.28
-  chassis:
-    serial_number: BMZGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2110054400
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-29:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3a
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.29
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3b
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:0a
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.29
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:0b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.29
-    bmc:
-      mac: 00:14:22:0c:e1:0a
-      ip: 172.17.0.29
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 725GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-30:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:fd
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:61fd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.30
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:fe
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:92
-      ip6: fe80::214:22ff:fe0c:e192
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.30
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:93
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.30
-    bmc:
-      mac: 00:14:22:0c:e1:92
-      ip: 172.17.0.30
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: GMZGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  main_memory:
-    ram_size: 2109562880
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-31:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:76
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.31
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:77
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:ba
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.31
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.31
-    bmc:
-      mac: 00:14:22:0c:e1:ba
-      ip: 172.17.0.31
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 725GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-32:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:98
-      rate: 10000000000
-      ip6: fe80::205:ad00:2:a598
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.32
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:99
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:b6
-      ip6: fe80::214:22ff:fe0c:dab6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.32
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:b7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.32
-    bmc:
-      mac: 00:14:22:0c:da:b6
-      ip: 172.17.0.32
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 635GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-33:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:76
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.33
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:77
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:94
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.33
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:95
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.33
-    bmc:
-      mac: 00:14:22:0c:da:94
-      ip: 172.17.0.33
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 725GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-34:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:69
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:6269
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.34
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:6a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:12
-      ip6: fe80::214:22ff:fe0c:da12
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.34
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:13
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.34
-    bmc:
-      mac: 00:14:22:0c:da:12
-      ip: 172.17.0.34
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  chassis:
-    serial_number: F25GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-35:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:37
-      rate: 10000000000
-      ip6: fe80::205:ad00:2:b637
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.35
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:38
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:36
-      ip6: fe80::214:22ff:fe0c:e136
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.35
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:37
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.35
-    bmc:
-      mac: 00:14:22:0c:e1:36
-      ip: 172.17.0.35
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: BKMGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-36:
-  bios:
-    version: A03
-    release_date: 05/12/2005
-    vendor: Dell Computer Corporation
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:22
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.36
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:23
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:6a
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.36
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:6b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.36
-    bmc:
-      mac: 00:14:22:0c:e1:6a
-      ip: 172.17.0.36
-  chassis:
-    serial_number: 6KMGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-37:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:f1
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.37
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:f2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:b1:7a
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.37
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:b1:7b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.37
-    bmc:
-      mac: 00:14:22:0c:b1:7a
-      ip: 172.17.0.37
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: H25GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-38:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e1
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:61e1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.38
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:13:72:69:a8:b6
-      ip6: fe80::213:72ff:fe69:a8b6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.38
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:13:72:69:a8:b7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.38
-    bmc:
-      mac: 00:13:72:69:a8:b6
-      ip: 172.17.0.38
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  chassis:
-    serial_number: FWRJZ91
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-39:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:05
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:6205
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.39
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:06
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:7c
-      ip6: fe80::214:22ff:fe0c:da7c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.39
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:7d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.39
-    bmc:
-      mac: 00:14:22:0c:da:7c
-      ip: 172.17.0.39
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  chassis:
-    serial_number: CD5GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-40:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b3:8f
-      rate: 10000000000
-      ip6: fe80::205:ad00:2:b38f
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.40
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b3:90
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:13:72:69:86:4c
-      ip6: fe80::213:72ff:fe69:864c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.40
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:13:72:69:86:4d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.40
-    bmc:
-      mac: 00:13:72:69:86:4c
-      ip: 172.17.0.40
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: ''
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  main_memory:
-    ram_size: 2109562880
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-41:
-  bios:
-    version: A03
-    release_date: 05/12/2005
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:5e
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a5e
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.41
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:5f
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:b3:92
-      ip6: fe80::214:22ff:fe0c:b392
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.41
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:b3:93
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.41
-    bmc:
-      mac: 00:14:22:0c:b3:92
-      ip: 172.17.0.41
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: D35GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2110054400
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-42:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:81
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:6281
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.42
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:82
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:a4
-      ip6: fe80::214:22ff:fe0c:e1a4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.42
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:a5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.42
-    bmc:
-      mac: 00:14:22:0c:e1:a4
-      ip: 172.17.0.42
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 4KMGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-43:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:75
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:6275
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.43
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:76
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:8c
-      ip6: fe80::214:22ff:fe0c:da8c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.43
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:8d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.43
-    bmc:
-      mac: 00:14:22:0c:da:8c
-      ip: 172.17.0.43
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  chassis:
-    serial_number: GC5GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-44:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:92
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.44
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:93
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:b1:1c
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.44
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:b1:1d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.44
-    bmc:
-      mac: 00:14:22:0c:b1:1c
-      ip: 172.17.0.44
-  chassis:
-    serial_number: 835GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  main_memory:
-    ram_size: 2109562880
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-45:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:89
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.45
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:8a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:88
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.45
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:89
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.45
-    bmc:
-      mac: 00:14:22:0c:da:88
-      ip: 172.17.0.45
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 725GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-46:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:62
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.46
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:63
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:7c
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.46
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:e1:7d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.46
-    bmc:
-      mac: 00:14:22:0c:e1:7c
-      ip: 172.17.0.46
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 725GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-47:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b0:2c
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.47
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b0:2d
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:de:34
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.47
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:de:35
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.47
-    bmc:
-      mac: 00:14:22:0c:de:34
-      ip: 172.17.0.47
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 6LZGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-48:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:59
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:6259
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.48
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:5a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:db:ca
-      ip6: fe80::214:22ff:fe0c:dbca
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.48
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:db:cb
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.48
-    bmc:
-      mac: 00:14:22:0c:db:ca
-      ip: 172.17.0.48
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 4LMGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-49:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:04
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.49
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:05
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:30
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.49
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.49
-    bmc:
-      mac: 
-      ip: 172.17.0.49
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: JNFGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  main_memory:
-    ram_size: 2109562880
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-50:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:32
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.50
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:33
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:a6
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.50
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:a7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.50
-    bmc:
-      mac: 00:14:22:0c:da:a6
-      ip: 172.17.0.50
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: 725GV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
-bordeplage-51:
-  bios:
-    version: A05
-    release_date: 01/09/2006
-    vendor: Dell Computer Corporation
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:4f:03
-      rate: 10000000000
-      ip6: fe80::205:ad00:1:5a76
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      ip: 172.18.0.51
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:4f:04
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25208 (MT23108 compat mode)
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:22:0c:da:7e
-      ip6: fe80::214:22ff:fe0c:da94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.0.51
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 00:14:22:0c:da:7f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000
-      mountable: true
-      ip: 172.16.3.51
-    bmc:
-      mac: 00:14:22:0c:da:7e
-      ip: 172.17.0.51
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407820800
-      rev: D701
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: FPFGV1J
-    manufacturer: Dell Computer Corporation
-    product_name: PowerEdge 1855
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2109562880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 16384
-    clock_speed: 3000000000
-    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
-    version: 3.00GHz
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 0
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/bordeaux/clusters/bordeplage_manual.yaml b/generators/input/sites/bordeaux/clusters/bordeplage_manual.yaml
deleted file mode 100644
index bdd9425453c958e115eab59c6cbb0d6c640f4415..0000000000000000000000000000000000000000
--- a/generators/input/sites/bordeaux/clusters/bordeplage_manual.yaml
+++ /dev/null
@@ -1,205 +0,0 @@
----
-bordeplage-1:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-1
-bordeplage-2:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-1
-bordeplage-3:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-1
-bordeplage-4:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-1
-bordeplage-5:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-1
-bordeplage-6:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-1
-bordeplage-7:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-1
-bordeplage-8:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-1
-bordeplage-9:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-1
-bordeplage-10:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-1
-bordeplage-11:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-12:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-13:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-14:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-15:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-16:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-17:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-18:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-19:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-20:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-21:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-22:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-23:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-24:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-25:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-26:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-27:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-28:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-29:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-30:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-31:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-32:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-33:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-34:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-35:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-36:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-37:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-38:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-39:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-40:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-41:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-42:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-43:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-44:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-45:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-46:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-47:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-48:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-49:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-50:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
-bordeplage-51:
-  network_interfaces:
-    eth0:
-      switch_name: sbordeplage-2
diff --git a/generators/input/sites/bordeaux/clusters/bordereau.rb b/generators/input/sites/bordeaux/clusters/bordereau.rb
deleted file mode 100644
index d4d7ab96233b69c1303724bc8ee05bf47ffada50..0000000000000000000000000000000000000000
--- a/generators/input/sites/bordeaux/clusters/bordereau.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-site :bordeaux do |site_uid|
-
-  cluster :bordereau do |cluster_uid|
-    model "IBM System x3455"
-    created_at Time.parse("2007-10-01 12:00 GMT").httpdate
-    misc "IPMI 2.0"
-    kavlan false
-
-    93.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 4433200000,
-        :node_flops => 16330000000
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup('bordereau_generated', node_uid, 'supported_job_types', 'virtual')
-        })
-
-        architecture({
-          :smp_size       => lookup('bordereau_generated', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('bordereau_generated', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('bordereau_generated', node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup('bordereau_generated', node_uid, 'processor', 'vendor'),
-          :model              => lookup('bordereau_generated', node_uid, 'processor', 'model'),
-          :version            => lookup('bordereau_generated', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('bordereau_generated', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('bordereau_generated', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('bordereau_generated', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('bordereau_generated', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('bordereau_generated', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('bordereau_generated', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('bordereau_generated', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('bordereau_generated', node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup('bordereau_generated', node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => lookup('bordereau_generated', node_uid, 'operating_system', 'name'),
-          :release  => "Squeeze",
-          :version  => lookup('bordereau_generated', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('bordereau_generated', node_uid, 'operating_system', 'kernel')
-        })
-        storage_devices [{
-          :interface  => 'SATA',
-          :size       => lookup('bordereau_generated', node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "sata_svw",
-          :device     => lookup('bordereau_generated', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('bordereau_generated', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('bordereau_generated', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('bordereau_generated', node_uid, 'block_devices', 'sda', 'rev')
-        }]
-        network_adapters [{
-          :interface        => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => "Broadcom",
-          :version 	    => "BCM5704",
-          :driver           => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => "gw-bordeaux",
-          :switch_port      => lookup('bordereau_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => "Broadcom",
-          :version 	    => "BCM5704",
-          :network_address  => "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
-          :ip               => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :ip6              => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :driver           => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 100.M,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('bordereau_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup('bordereau_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc"
-        }]
-
-        chassis({
-          :serial       => lookup('bordereau_generated', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('bordereau_generated', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('bordereau_generated', node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup('bordereau_generated', node_uid, 'bios', 'version'),
-          :vendor       => lookup('bordereau_generated', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('bordereau_generated', node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-        monitoring({
-          :wattmeter  => false
-        })
-
-      end
-    end
-  end # cluster bordereau
-end
diff --git a/generators/input/sites/bordeaux/clusters/bordereau_generated.yaml b/generators/input/sites/bordeaux/clusters/bordereau_generated.yaml
deleted file mode 100644
index 2b18b4f07544001bf1226483c65ca6274f611d31..0000000000000000000000000000000000000000
--- a/generators/input/sites/bordeaux/clusters/bordereau_generated.yaml
+++ /dev/null
@@ -1,5860 +0,0 @@
----
-bordereau-1:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.1
-    eth1:
-      mounted: false
-      mac: 
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.1
-    bmc:
-      mac: 
-      ip: 172.17.4.1
-  chassis:
-    serial_number: 
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-2:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5d:2c
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.2
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5d:2d
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.2
-    bmc:
-      mac: 00:14:5e:55:5d:2e
-      ip: 172.17.4.2
-  chassis:
-    serial_number: 
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-3:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5c:42
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.3
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5c:43
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.3
-    bmc:
-      mac: 00:14:5e:55:5c:44
-      ip: 172.17.4.3
-  chassis:
-    serial_number: KDDDRZH
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-4:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:68:c7
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.4
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:68:c8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.4
-    bmc:
-      mac: 00:14:5e:55:68:c9
-      ip: 172.17.4.4
-  chassis:
-    serial_number: 
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-5:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:61:94
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.5
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:61:95
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.5
-    bmc:
-      mac: 00:14:5e:55:61:96
-      ip: 172.17.4.5
-  chassis:
-    serial_number: KDDDRXT
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-6:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:58:ee
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.6
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:58:ef
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.6
-    bmc:
-      mac: 00:14:5e:55:58:f0
-      ip: 172.17.4.6
-  chassis:
-    serial_number: KDDDRZM
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-7:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5e:7c
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.7
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5e:7d
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.7
-    bmc:
-      mac: 00:14:5e:55:5e:7e
-      ip: 172.17.4.7
-  chassis:
-    serial_number: KDDDRVP
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-8:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:60:f8
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.8
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:60:f9
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.8
-    bmc:
-      mac: 00:14:5e:55:60:fa
-      ip: 172.17.4.8
-  chassis:
-    serial_number: KDDDRVT
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-9:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5e:e8
-      ip6: fe80::214:5eff:fe55:5ee8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.9
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5e:e9
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.9
-    bmc:
-      mac: 00:14:5e:55:5e:ea
-      ip: 172.17.4.9
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: KDDDRXX
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-10:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:6b:ca
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.10
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:6b:cb
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.10
-    bmc:
-      mac: 00:14:5e:55:6b:cc
-      ip: 172.17.4.10
-  chassis:
-    serial_number: KDDDRWH
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-11:
-  bios:
-    version: IBM BIOS Version 1.40-[C0E140AUS-1.40]-
-    release_date: 09/15/2008
-    vendor: IBM
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5c:81
-      ip6: fe80::214:5eff:fe55:5c81
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.11
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5c:82
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.11
-    bmc:
-      mac: 00:14:5e:55:5c:83
-      ip: 172.17.4.11
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: KDDDRXW
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-12:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:58:f7
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.12
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:58:f8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.12
-    bmc:
-      mac: 00:14:5e:55:58:f9
-      ip: 172.17.4.12
-  chassis:
-    serial_number: KDDDRZR
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-13:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:59:63
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.13
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:59:64
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.13
-    bmc:
-      mac: 00:14:5e:55:59:65
-      ip: 172.17.4.13
-  chassis:
-    serial_number: KDDDRXK
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-14:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:59:5d
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.14
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:59:5e
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.14
-    bmc:
-      mac: 00:14:5e:55:59:5f
-      ip: 172.17.4.14
-  chassis:
-    serial_number: KDDDRZF
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-15:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:6a:f2
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.15
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:6a:f3
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.15
-    bmc:
-      mac: 00:14:5e:55:6a:f4
-      ip: 172.17.4.15
-  chassis:
-    serial_number: KDDDRWB
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-16:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5d:ec
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.16
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5d:ed
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.16
-    bmc:
-      mac: 00:14:5e:55:5d:ee
-      ip: 172.17.4.16
-  chassis:
-    serial_number: KDDDRXD
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-17:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5e:a9
-      ip6: fe80::214:5eff:fe55:5ea9
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.17
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5e:aa
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.17
-    bmc:
-      mac: 00:14:5e:55:5e:ab
-      ip: 172.17.4.17
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  chassis:
-    serial_number: KDDDRYW
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4157911040
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-18:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:64:0d
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.18
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:64:0e
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.18
-    bmc:
-      mac: 00:14:5e:55:64:0f
-      ip: 172.17.4.18
-  chassis:
-    serial_number: KDDDRYN
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-19:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:68:67
-      ip6: fe80::214:5eff:fe55:6867
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.19
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:68:68
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.19
-    bmc:
-      mac: 00:14:5e:55:68:69
-      ip: 172.17.4.19
-  chassis:
-    serial_number: KDDDRXN
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4157911040
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-20:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:62:b1
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.20
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:62:b2
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.20
-    bmc:
-      mac: 00:14:5e:55:62:b3
-      ip: 172.17.4.20
-  chassis:
-    serial_number: KDDDRXB
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-21:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5a:98
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.21
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5a:99
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.21
-    bmc:
-      mac: 00:14:5e:55:5a:9a
-      ip: 172.17.4.21
-  chassis:
-    serial_number: KDDDRXV
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-22:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:59:84
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.22
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:59:85
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.22
-    bmc:
-      mac: 00:14:5e:55:59:86
-      ip: 172.17.4.22
-  chassis:
-    serial_number: KDDDRWY
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-23:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:62:96
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.23
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:62:97
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.23
-    bmc:
-      mac: 00:14:5e:55:62:98
-      ip: 172.17.4.23
-  chassis:
-    serial_number: KDDDRWM
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-24:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5d:da
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.24
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5d:db
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.24
-    bmc:
-      mac: 00:14:5e:55:5d:dc
-      ip: 172.17.4.24
-  chassis:
-    serial_number: KDDDTAA
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-25:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5d:b9
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.25
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5d:ba
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.25
-    bmc:
-      mac: 00:14:5e:55:5d:bb
-      ip: 172.17.4.25
-  chassis:
-    serial_number: KDDDRYT
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-26:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:6d:2f
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.26
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:6d:30
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.26
-    bmc:
-      mac: 00:14:5e:55:6d:31
-      ip: 172.17.4.26
-  chassis:
-    serial_number: KDDDRVW
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-27:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5c:69
-      ip6: fe80::214:5eff:fe55:5c69
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.27
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5c:6a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.27
-    bmc:
-      mac: 00:14:5e:55:5d:6b
-      ip: 172.17.4.27
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: KDDDTAG
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4157911040
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2592000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-28:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5e:88
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.28
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5e:89
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.28
-    bmc:
-      mac: 00:14:5e:55:5e:8a
-      ip: 172.17.4.28
-  chassis:
-    serial_number: KDDDRYZ
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-29:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5c:c3
-      ip6: fe80::214:5eff:fe55:5cc3
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.29
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5c:c4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.29
-    bmc:
-      mac: 00:14:5e:55:5c:c5
-      ip: 172.17.4.29
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  chassis:
-    serial_number: KDDDTAH
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4157911040
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-30:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5e:d6
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.30
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5e:d7
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.30
-    bmc:
-      mac: 00:14:5e:55:5e:d8
-      ip: 172.17.4.30
-  chassis:
-    serial_number: 
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-31:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:59:b7
-      ip6: fe80::214:5eff:fe55:59b7
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.31
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:59:b8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.31
-    bmc:
-      mac: 00:14:5e:55:59:b9
-      ip: 172.17.4.31
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: KDDDRWL
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  main_memory:
-    ram_size: 4157911040
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2592000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-32:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:59:bd
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.32
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:59:be
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.32
-    bmc:
-      mac: 00:14:5e:55:59:bf
-      ip: 172.17.4.32
-  chassis:
-    serial_number: KDDDRXA
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-33:
-  bios:
-    version: IBM BIOS Version 1.40-[C0E140AUS-1.40]-
-    release_date: 09/15/2008
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5e:b2
-      ip6: fe80::214:5eff:fe55:5eb2
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.33
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5e:b3
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.33
-    bmc:
-      mac: 00:14:5e:55:5e:b4
-      ip: 172.17.4.33
-  chassis:
-    serial_number: KDDDRYH
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4157911040
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2592000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-34:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5d:02
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.34
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5d:03
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.34
-    bmc:
-      mac: 00:14:5e:55:5d:04
-      ip: 172.17.4.34
-  chassis:
-    serial_number: 
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-35:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5e:22
-      ip6: fe80::214:5eff:fe55:5e22
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.35
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5e:23
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.35
-    bmc:
-      mac: 00:14:5e:55:5e:24
-      ip: 172.17.4.35
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  chassis:
-    serial_number: KDDDRZZ
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-36:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:69:f0
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.36
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:69:f1
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.36
-    bmc:
-      mac: 00:14:5e:55:69:f2
-      ip: 172.17.4.36
-  chassis:
-    serial_number: KDDDTAC
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-37:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5f:d2
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.37
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5f:d3
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.37
-    bmc:
-      mac: 00:14:5e:55:5f:d4
-      ip: 172.17.4.37
-  chassis:
-    serial_number: KDDDRZL
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-38:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5f:0f
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.38
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5f:10
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.38
-    bmc:
-      mac: 00:14:5e:55:5f:11
-      ip: 172.17.4.38
-  chassis:
-    serial_number: KDDDRZP
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-39:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:63:2f
-      ip6: fe80::214:5eff:fe55:632f
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.39
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:63:30
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.39
-    bmc:
-      mac: 00:14:5e:55:63:31
-      ip: 172.17.4.39
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  chassis:
-    serial_number: KDDDRYG
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-40:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.40
-    eth1:
-      mounted: false
-      mac: 
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.40
-    bmc:
-      mac: 
-      ip: 172.17.4.40
-  chassis:
-    serial_number: 
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-41:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:59:00
-      ip6: fe80::214:5eff:fe55:5900
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.41
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:59:01
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.41
-    bmc:
-      mac: 00:14:5e:55:59:02
-      ip: 172.17.4.41
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  chassis:
-    serial_number: KDDDRYB
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4157911040
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-42:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:60:95
-      ip6: fe80::214:5eff:fe55:6095
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.42
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:60:96
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.42
-    bmc:
-      mac: 00:14:5e:55:60:97
-      ip: 172.17.4.42
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  chassis:
-    serial_number: KDDDRYF
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-43:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:6c:00
-      ip6: fe80::214:5eff:fe55:6c00
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.43
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:6c:01
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.43
-    bmc:
-      mac: 00:14:5e:55:6c:02
-      ip: 172.17.4.43
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  chassis:
-    serial_number: KDDDRWD
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4157911040
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-44:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:59:d2
-      ip6: fe80::214:5eff:fe55:59d2
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.44
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:59:d3
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.44
-    bmc:
-      mac: 00:14:5e:55:59:d4
-      ip: 172.17.4.44
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  chassis:
-    serial_number: KDDDRXL
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-45:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5c:bd
-      ip6: fe80::214:5eff:fe55:5cbd
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.45
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5c:be
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.45
-    bmc:
-      mac: 00:14:5e:55:5c:bf
-      ip: 172.17.4.45
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: KDDDRWZ
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-46:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5c:60
-      ip6: fe80::214:5eff:fe55:5c60
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.46
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5c:61
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.46
-    bmc:
-      mac: 00:14:5e:55:5c:62
-      ip: 172.17.4.46
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: KDDDRYY
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  main_memory:
-    ram_size: 4157911040
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-47:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:6c:a8
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.47
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:6c:a9
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.47
-    bmc:
-      mac: 00:14:5e:55:6c:aa
-      ip: 172.17.4.47
-  chassis:
-    serial_number: KDDDRWA
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-48:
-  bios:
-    version: IBM BIOS Version 1.40-[C0E140AUS-1.40]-
-    release_date: 09/15/2008
-    vendor: IBM
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:58:fd
-      ip6: fe80::214:5eff:fe55:58fd
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.48
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:58:fe
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.48
-    bmc:
-      mac: 00:14:5e:55:58:ff
-      ip: 172.17.4.48
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: KDDDRZV
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  main_memory:
-    ram_size: 4157911040
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-49:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:62:e7
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.49
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:62:e8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.49
-    bmc:
-      mac: 00:14:5e:55:62:d9
-      ip: 172.17.4.49
-  chassis:
-    serial_number: KDDDRZA
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-50:
-  bios:
-    version: IBM BIOS Version 1.40-[C0E140AUS-1.40]-
-    release_date: 09/15/2008
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5e:ac
-      ip6: fe80::214:5eff:fe55:5eac
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.50
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5e:ad
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.50
-    bmc:
-      mac: 00:14:5e:55:5e:ae
-      ip: 172.17.4.50
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: KDDDRYR
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-51:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5c:d5
-      ip6: fe80::214:5eff:fe55:5cd5
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.51
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5c:d6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.51
-    bmc:
-      mac: 00:14:5e:55:5c:d7
-      ip: 172.17.4.51
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: KDDDRYA
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  main_memory:
-    ram_size: 4157911040
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-52:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5d:b3
-      ip6: fe80::214:5eff:fe55:5db3
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.52
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5d:b4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.52
-    bmc:
-      mac: 00:14:5e:55:5d:b5
-      ip: 172.17.4.52
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: KDDDRYP
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4157911040
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2592000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-53:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:6c:1b
-      ip6: fe80::214:5eff:fe55:6c1b
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.53
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:6c:1c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.53
-    bmc:
-      mac: 00:14:5e:55:6c:1d
-      ip: 172.17.4.53
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: KDDDRVV
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-54:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:63:b6
-      ip6: fe80::214:5eff:fe55:63b6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.54
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:63:b7
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.54
-    bmc:
-      mac: 00:14:5e:55:63:b8
-      ip: 172.17.4.54
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  chassis:
-    serial_number: KDDDRZX
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4157911040
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-55:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5c:ed
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.55
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5c:ee
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.55
-    bmc:
-      mac: 00:14:5e:55:5c:ef
-      ip: 172.17.4.55
-  chassis:
-    serial_number: KDDDRZY
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-56:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:60:cb
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.56
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:60:cc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.56
-    bmc:
-      mac: 00:14:5e:55:60:cd
-      ip: 172.17.4.56
-  chassis:
-    serial_number: KDDDRZT
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-57:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.57
-    eth1:
-      mounted: false
-      mac: 
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.57
-    bmc:
-      mac: 
-      ip: 172.17.4.57
-  chassis:
-    serial_number: 
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-58:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5e:a6
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.58
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5e:a7
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.58
-    bmc:
-      mac: 00:14:5e:55:5e:a8
-      ip: 172.17.4.58
-  chassis:
-    serial_number: KDDDRZC
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-59:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5c:d8
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.59
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5c:d9
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.59
-    bmc:
-      mac: 00:14:5e:55:5c:da
-      ip: 172.17.4.59
-  chassis:
-    serial_number: KDDDRZD
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-60:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5b:5b
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.60
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5b:5c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.60
-    bmc:
-      mac: 00:14:5e:55:5b:5d
-      ip: 172.17.4.60
-  chassis:
-    serial_number: KDDDRZN
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-61:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:58:49
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.61
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:58:4a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.61
-    bmc:
-      mac: 00:14:5e:55:58:4b
-      ip: 172.17.4.61
-  chassis:
-    serial_number: KDDDTAL
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-62:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:63:26
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.62
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:63:27
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.62
-    bmc:
-      mac: 00:14:5e:55:63:28
-      ip: 172.17.4.62
-  chassis:
-    serial_number: KDDDRWT
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-63:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5c:6c
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.63
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5c:6d
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.63
-    bmc:
-      mac: 00:14:5e:55:5c:6e
-      ip: 172.17.4.63
-  chassis:
-    serial_number: KDDDRZB
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-64:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5c:cf
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.64
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5c:d0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.64
-    bmc:
-      mac: 00:14:5e:55:5c:d1
-      ip: 172.17.4.64
-  chassis:
-    serial_number: KDDDTAD
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-65:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:59:f9
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.65
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:59:fa
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.65
-    bmc:
-      mac: 00:14:5e:55:59:fb
-      ip: 172.17.4.65
-  chassis:
-    serial_number: KDDDRWX
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-66:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5e:19
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.66
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5e:1a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.66
-    bmc:
-      mac: 00:14:5e:55:5e:1b
-      ip: 172.17.4.66
-  chassis:
-    serial_number: KDDDRYX
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-67:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5c:1b
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.67
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5c:1c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.67
-    bmc:
-      mac: 00:14:5e:55:5c:1d
-      ip: 172.17.4.67
-  chassis:
-    serial_number: KDDDRZW
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-68:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:57:89
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.68
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:57:8a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.68
-    bmc:
-      mac: 00:14:5e:55:57:8b
-      ip: 172.17.4.68
-  chassis:
-    serial_number: KDDDRXZ
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-69:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:63:ce
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.69
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:63:cf
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.69
-    bmc:
-      mac: 00:14:5e:55:63:d0
-      ip: 172.17.4.69
-  chassis:
-    serial_number: KDDDRWW
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-70:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:6a:fe
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.70
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:6a:ff
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.70
-    bmc:
-      mac: 00:14:5e:55:6b:00
-      ip: 172.17.4.70
-  chassis:
-    serial_number: KDDDRWC
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-71:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:59:44
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.71
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:59:45
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.71
-    bmc:
-      mac: 00:14:5e:55:59:46
-      ip: 172.17.4.71
-  chassis:
-    serial_number: KDDDRZK
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-72:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5a:3e
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.72
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5a:3f
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.72
-    bmc:
-      mac: 00:14:5e:55:5a:40
-      ip: 172.17.4.72
-  chassis:
-    serial_number: KDDDRXM
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-73:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:6a:1a
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.73
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:6a:1b
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.73
-    bmc:
-      mac: 00:14:5e:55:6a:1c
-      ip: 172.17.4.73
-  chassis:
-    serial_number: KDDDTAK
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-74:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:64:04
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.74
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:64:05
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.74
-    bmc:
-      mac: 00:14:5e:55:64:06
-      ip: 172.17.4.74
-  chassis:
-    serial_number: KDDDRYM
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-75:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5e:af
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.75
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5e:b0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.75
-    bmc:
-      mac: 00:14:5e:55:5e:b1
-      ip: 172.17.4.75
-  chassis:
-    serial_number: KDDDRWV
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-76:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5d:08
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.76
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5d:09
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.76
-    bmc:
-      mac: 00:14:5e:55:5d:0a
-      ip: 172.17.4.76
-  chassis:
-    serial_number: KDDDTAF
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-77:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:63:5f
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.77
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:63:60
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.77
-    bmc:
-      mac: 00:14:5e:55:63:61
-      ip: 172.17.4.77
-  chassis:
-    serial_number: KDDDRWN
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-78:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:63:fb
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.78
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:63:fc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.78
-    bmc:
-      mac: 00:14:5e:55:63:fd
-      ip: 172.17.4.78
-  chassis:
-    serial_number: KDDDRXP
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-79:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:62:ed
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.79
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:62:ee
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.79
-    bmc:
-      mac: 00:14:5e:55:62:ef
-      ip: 172.17.4.79
-  chassis:
-    serial_number: 
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-80:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5c:ae
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.80
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5c:af
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.80
-    bmc:
-      mac: 00:14:5e:55:5c:b0
-      ip: 172.17.1.80
-  chassis:
-    serial_number: KDDDRYL
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-81:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:58:a6
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.81
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:58:a7
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.81
-    bmc:
-      mac: 00:14:5e:55:58:a8
-      ip: 172.17.1.81
-  chassis:
-    serial_number: KDDDRYV
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-82:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:68:85
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.82
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:68:86
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.82
-    bmc:
-      mac: 00:14:5e:55:68:87
-      ip: 172.17.1.82
-  chassis:
-    serial_number: KDDDRVZ
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-83:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:6d:23
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.83
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:6d:24
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.83
-    bmc:
-      mac: 00:14:5e:55:6d:25
-      ip: 172.17.1.83
-  chassis:
-    serial_number: KDDDRVY
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-84:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5c:48
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.84
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5c:49
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.84
-    bmc:
-      mac: 00:14:5e:55:5c:4a
-      ip: 172.17.1.84
-  chassis:
-    serial_number: KDDDRWR
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-85:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:59:41
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.85
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:59:42
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.85
-    bmc:
-      mac: 00:14:5e:55:59:43
-      ip: 172.17.1.85
-  chassis:
-    serial_number: KDDDRYC
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-86:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:68:ca
-      ip6: fe80::214:5eff:fe55:68ca
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.86
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:68:cb
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.86
-    bmc:
-      mac: 00:14:5e:55:68:cc
-      ip: 172.17.1.86
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: KDDDRYK
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-87:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5e:28
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.87
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5e:29
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.87
-    bmc:
-      mac: 00:14:5e:55:5e:2a
-      ip: 172.17.1.87
-  chassis:
-    serial_number: KDDDRXC
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-88:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5d:6b
-      ip6: fe80::214:5eff:fe55:5d6b
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.88
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5d:6c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.88
-    bmc:
-      mac: 00:14:5e:55:5d:6d
-      ip: 172.17.1.88
-  chassis:
-    serial_number: KDDDRXF
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4157911040
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-89:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:6d:05
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.89
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:6d:06
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.89
-    bmc:
-      mac: 00:14:5e:55:6d:07
-      ip: 172.17.1.89
-  chassis:
-    serial_number: KDDDRWF
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-90:
-  bios:
-    version: IBM BIOS Version 1.40-[C0E140AUS-1.40]-
-    release_date: 09/15/2008
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:6d:29
-      ip6: fe80::214:5eff:fe55:6d29
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.90
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:6d:2a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.90
-    bmc:
-      mac: 00:14:5e:55:6d:2b
-      ip: 172.17.1.90
-  chassis:
-    serial_number: KDDDRWG
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-91:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:5c:c6
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.91
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:5c:c7
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.91
-    bmc:
-      mac: 00:14:5e:55:5c:c8
-      ip: 172.17.1.91
-  chassis:
-    serial_number: KDDDTAB
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-92:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:6a:4a
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.92
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:6a:4b
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.92
-    bmc:
-      mac: 00:14:5e:55:6a:4c
-      ip: 172.17.1.92
-  chassis:
-    serial_number: KDDDRYD
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
-bordereau-93:
-  bios:
-    version: IBM BIOS Version 1.32-[C0E132AUS-1.32]-
-    release_date: 01/04/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: Hitachi HDS72168
-      device: sda
-      size: 80032038912
-      rev: P21O
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:55:6d:14
-      ip6: fe80::214:5eff:fe55:6ca8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.1.93
-    eth1:
-      mounted: false
-      mac: 00:14:5e:55:6d:15
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.4.93
-    bmc:
-      mac: 00:14:5e:55:6d:16
-      ip: 172.17.1.93
-  chassis:
-    serial_number: KDDDRWP
-    manufacturer: IBM
-    product_name: IBM System x3455-[7986Z1J]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2593000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4157911040
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/bordeaux/clusters/bordereau_manual.yaml b/generators/input/sites/bordeaux/clusters/bordereau_manual.yaml
deleted file mode 100644
index d2d85c988afe4cb95fa476eba3aaebc2c5ddc168..0000000000000000000000000000000000000000
--- a/generators/input/sites/bordeaux/clusters/bordereau_manual.yaml
+++ /dev/null
@@ -1,361 +0,0 @@
----
-bordereau-1:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C1
-bordereau-2:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C2
-bordereau-3:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C3
-bordereau-4:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C4
-bordereau-5:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C5
-bordereau-6:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C6
-bordereau-7:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C7
-bordereau-8:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C8
-bordereau-9:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C9
-bordereau-10:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C10
-bordereau-11:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C11
-bordereau-12:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C12
-bordereau-13:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C13
-bordereau-14:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C14
-bordereau-15:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C15
-bordereau-16:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C16
-bordereau-17:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C17
-bordereau-18:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C18
-bordereau-19:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C19
-bordereau-20:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C20
-bordereau-21:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C21
-bordereau-22:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C22
-bordereau-23:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/C23
-bordereau-24:
-  network_interfaces: {}
-bordereau-25:
-  network_interfaces: {}
-bordereau-26:
-  network_interfaces: {}
-bordereau-27:
-  network_interfaces: {}
-bordereau-28:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/E4
-bordereau-29:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/E5
-bordereau-30:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/E6
-bordereau-31:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/E7
-bordereau-32:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/E8
-bordereau-33:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/E9
-bordereau-34:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/E10
-bordereau-35:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/E11
-bordereau-36:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/E12
-bordereau-37:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/E13
-bordereau-38:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/E14
-bordereau-39:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/B1
-bordereau-40:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/B2
-bordereau-41:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/B3
-bordereau-42:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/B4
-bordereau-43:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/B5
-bordereau-44:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/B6
-bordereau-45:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/B7
-bordereau-46:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/B8
-bordereau-47:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/B9
-bordereau-48:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/B10
-bordereau-49:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/B11
-bordereau-50:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/B12
-bordereau-51:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/B13
-bordereau-52:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/B14
-bordereau-53:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/B15
-bordereau-54:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/B16
-bordereau-55:
-  network_interfaces: {}
-bordereau-56:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D1
-bordereau-57:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D2
-bordereau-58:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D3
-bordereau-59:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D4
-bordereau-60:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D5
-bordereau-61:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D6
-bordereau-62:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D7
-bordereau-63:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D8
-bordereau-64:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D9
-bordereau-65:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D10
-bordereau-66:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D11
-bordereau-67:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D12
-bordereau-68:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D13
-bordereau-69:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D14
-bordereau-70:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D15
-bordereau-71:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D16
-bordereau-72:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D17
-bordereau-73:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D18
-bordereau-74:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D19
-bordereau-75:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D20
-bordereau-76:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D21
-bordereau-77:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D22
-bordereau-78:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/D23
-bordereau-79:
-  network_interfaces: {}
-bordereau-80:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/F1
-bordereau-81:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/F2
-bordereau-82:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/F3
-bordereau-83:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/F4
-bordereau-84:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/F5
-bordereau-85:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/F6
-bordereau-86:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/F8
-bordereau-87:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/F8
-bordereau-88:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/F9
-bordereau-89:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/F10
-bordereau-90:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/F11
-bordereau-91:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/F12
-bordereau-92:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/F13
-bordereau-93:
-  network_interfaces:
-    eth0:
-      switch_port: Gi/F14
diff --git a/generators/input/sites/bordeaux/clusters/borderline.rb b/generators/input/sites/bordeaux/clusters/borderline.rb
deleted file mode 100644
index a52139231ff7d84eb145bd8f2d0290dc8583b9f4..0000000000000000000000000000000000000000
--- a/generators/input/sites/bordeaux/clusters/borderline.rb
+++ /dev/null
@@ -1,180 +0,0 @@
-site :bordeaux do |site_uid|
-
-  cluster :borderline do |cluster_uid|
-    model "IBM System x3755"
-    created_at Time.parse("2007-10-01 12:00 GMT").httpdate
-    misc "IPMI 2.0"
-    kavlan false
-
-    10.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 4424000000,
-        :node_flops => 34880000000
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup('borderline_generated', node_uid, 'supported_job_types', 'virtual')
-        })
-
-        architecture({
-          :smp_size       => lookup('borderline_generated', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('borderline_generated', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('borderline_generated', node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup('borderline_generated', node_uid, 'processor', 'vendor'),
-          :model              => lookup('borderline_generated', node_uid, 'processor', 'model'),
-          :version            => lookup('borderline_generated', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('borderline_generated', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('borderline_generated', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('borderline_generated', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('borderline_generated', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('borderline_generated', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('borderline_generated', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('borderline_generated', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('borderline_generated', node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup('borderline_generated', node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => lookup('borderline_generated', node_uid, 'operating_system', 'name'),
-          :release  => "Squeeze",
-          :version  => lookup('borderline_generated', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('borderline_generated', node_uid, 'operating_system', 'kernel')
-        })
-        storage_devices [{
-          :interface  => 'SAS',
-          :size       => lookup('borderline_generated', node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "aacraid",
-          :device     => lookup('borderline_generated', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('borderline_generated', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('borderline_generated', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('borderline_generated', node_uid, 'block_devices', 'sda', 'rev')
-        }]
-
-        network_adapters [{
-          :interface        => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => "Broadcom",
-          :version 	    => "NetXtreme II BCM5708",
-          :driver           => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => "sborderline",
-          :switch_port      => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor 	    => "Broadcom",
-          :version 	    => "NetXtreme II BCM5708",
-          :network_address  => "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
-          :ip               => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :driver           => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'rate'),
-          :device           => "ib0",
-          :enabled          => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'mounted'),
-          :vendor           => 'Mellanox',
-          :version 	    => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'version'),
-          :driver           => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'driver'),
-          :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :guid             => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'guid')
-        },
-        {
-          :interface        => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib1', 'interface'),
-          :rate             => 10.G,
-          :device           => "ib1",
-          :enabled          => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib1', 'enabled'),
-          :management       => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib1', 'management'),
-          :mountable        => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib1', 'mountable'),
-          :mounted          => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib1', 'mounted'),
-          :vendor           => 'Mellanox',
-          :version 	    => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib1', 'version'),
-          :driver           => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib1', 'driver'),
-          :guid             => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib1', 'guid')
-        },
-        {
-          :interface 		=> 'Myrinet',
-          :rate 		=> 10.G,
-          :network_address 	=> "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
-          :ip 			=> lookup('borderline_generated', node_uid, 'network_interfaces', 'myri0', 'ip'),
-          :ip6 			=> lookup('borderline_generated', node_uid, 'network_interfaces', 'myri0', 'ip6'),
-          :mac 			=> lookup('borderline_generated', node_uid, 'network_interfaces', 'myri0', 'mac'),
-          :vendor 		=> 'Myrinet',
-          :version 		=> "10G-PCIE-8A-C",
-          :driver               => lookup('borderline_generated', node_uid, 'network_interfaces', 'myri0', 'driver'),
-          :enabled              => lookup('borderline_generated', node_uid, 'network_interfaces', 'myri0', 'enabled'),
-          :management           => lookup('borderline_generated', node_uid, 'network_interfaces', 'myri0', 'management'),
-          :mountable            => lookup('borderline_generated', node_uid, 'network_interfaces', 'myri0', 'mountable'),
-          :mounted              => lookup('borderline_generated', node_uid, 'network_interfaces', 'myri0', 'mounted'),
-          :management 		=> false,
-          :device 		=> "myri0"
-        },
-        {
-          :interface 		=> 'Ethernet',
-          :rate 		=> 100.M,
-          :network_address 	=> "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip 			=> lookup('borderline_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac 			=> lookup('borderline_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled 		=> true,
-          :mounted 		=> false,
-          :mountable 		=> false,
-          :management 		=> true,
-          :device 		=> "bmc"
-        }]
-
-        chassis({
-          :serial       => lookup('borderline_generated', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('borderline_generated', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('borderline_generated', node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup('borderline_generated', node_uid, 'bios', 'version'),
-          :vendor       => lookup('borderline_generated', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('borderline_generated', node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-
-        monitoring({
-          :wattmeter  => false
-        })
-      end
-    end
-  end # cluster borderline
-end
diff --git a/generators/input/sites/bordeaux/clusters/borderline_generated.yaml b/generators/input/sites/bordeaux/clusters/borderline_generated.yaml
deleted file mode 100644
index eb4a759ccafaf6ad521735c8a2c603577989f142..0000000000000000000000000000000000000000
--- a/generators/input/sites/bordeaux/clusters/borderline_generated.yaml
+++ /dev/null
@@ -1,951 +0,0 @@
----
-borderline-1:
-  bios:
-    version: -[ZYE133AUS-1.13]-
-    release_date: 08/09/2007
-    vendor: IBM
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: 8k-l Stripe
-      device: sda
-      size: 586772643840
-      rev: V1.0
-      vendor: ServeRA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:5d
-      rate: 20000000000
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.2.1
-      driver: mlx4_core
-      mountable: true
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:b6:e9
-      ip6: fe80::260:ddff:fe47:b67a
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.2.11
-      driver: mx ethernet (myri)
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:5e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:57:67:04
-      ip6: fe80::214:5eff:fe57:cc3e
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.2.1
-    eth1:
-      mounted: false
-      mac: 00:14:5e:57:67:02
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.5.1
-    bmc:
-      mac: 00:14:5e:57:67:06
-      ip: 172.17.2.1
-  chassis:
-    serial_number: 99A3249
-    manufacturer: IBM
-    product_name: IBM System x3755 -[88774RG]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2599000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 8218
-    version: 8218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 31760584704
-  architecture:
-    smp_size: 4
-    platform_type: x86_64
-    smt_size: 8
-borderline-2:
-  bios:
-    version: -[ZYE129AUS-1.08]-
-    release_date: 02/23/2007
-    vendor: IBM
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: 8k-l Stripe
-      device: sda
-      size: 586772643840
-      rev: V1.0
-      vendor: ServeRA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:85
-      rate: 20000000000
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.2.2
-      driver: mlx4_core
-      mountable: true
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:b6:7a
-      ip6: fe80::260:ddff:fe47:b67a
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.2.12
-      driver: mx ethernet (myri)
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:86
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:57:cc:3e
-      ip6: fe80::214:5eff:fe57:cc3e
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.2.2
-    eth1:
-      mounted: false
-      mac: 00:14:5e:57:cc:3c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.5.2
-    bmc:
-      mac: 00:14:5e:57:cc:40
-      ip: 172.17.2.2
-  chassis:
-    serial_number: 99A3255
-    manufacturer: IBM
-    product_name: IBM System x3755 -[88774RG]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2599000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 8218
-    version: 8218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 31760584704
-  architecture:
-    smp_size: 4
-    platform_type: x86_64
-    smt_size: 8
-borderline-3:
-  bios:
-    version: -[ZYE129AUS-1.08]-
-    release_date: 02/23/2007
-    vendor: IBM
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: 8k-l Stripe
-      device: sda
-      size: 586783129600
-      rev: V1.0
-      vendor: ServeRA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:ed
-      rate: 20000000000
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.2.3
-      driver: mlx4_core
-      mountable: true
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:b5:69
-      ip6: fe80::260:ddff:fe47:b569
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.2.13
-      driver: mx ethernet (myri)
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:ee
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:57:6d:a0
-      ip6: fe80::214:5eff:fe57:6da0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.2.3
-    eth1:
-      mounted: false
-      mac: 00:14:5e:57:6d:9e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.5.3
-    bmc:
-      mac: 00:14:5e:57:6d:a2
-      ip: 172.17.2.3
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 99A3248
-    manufacturer: IBM
-    product_name: IBM System x3755 -[88774RG]-
-  main_memory:
-    ram_size: 33878695936
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2599000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 8218
-    version: 8218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 4
-    platform_type: x86_64
-    smt_size: 8
-borderline-4:
-  bios:
-    version: -[ZYE129AUS-1.08]-
-    release_date: 02/23/2007
-    vendor: IBM
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: 8k-l Stripe
-      device: sda
-      size: 586783129600
-      rev: V1.0
-      vendor: ServeRA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1e:85
-      rate: 20000000000
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.2.4
-      driver: mlx4_core
-      mountable: true
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:b7:6e
-      ip6: fe80::260:ddff:fe47:b76e
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.2.14
-      driver: mx ethernet (myri)
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1e:86
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:57:c4:d0
-      ip6: fe80::214:5eff:fe57:c4d0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.2.4
-    eth1:
-      mounted: false
-      mac: 00:14:5e:57:c4:ce
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.5.4
-    bmc:
-      mac: 00:14:5e:57:c4:d2
-      ip: 172.17.2.4
-  chassis:
-    serial_number: 99A3252
-    manufacturer: IBM
-    product_name: IBM System x3755 -[88774RG]-
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 33878695936
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2599000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 8218
-    version: 8218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 4
-    platform_type: x86_64
-    smt_size: 8
-borderline-5:
-  bios:
-    version: -[ZYE129AUS-1.08]-
-    release_date: 02/23/2007
-    vendor: IBM
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: 8k-l Stripe
-      device: sda
-      size: 586772643840
-      rev: V1.0
-      vendor: ServeRA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4d
-      rate: 20000000000
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.2.5
-      driver: mlx4_core
-      mountable: true
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:b6:50
-      ip6: fe80::260:ddff:fe47:b650
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.2.15
-      driver: mx ethernet (myri)
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:57:6d:46
-      ip6: fe80::214:5eff:fe57:6d46
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.2.5
-    eth1:
-      mounted: false
-      mac: 00:14:5e:57:6d:44
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.5.5
-    bmc:
-      mac: 00:14:5e:57:6d:48
-      ip: 172.17.2.5
-  chassis:
-    serial_number: 99A3257
-    manufacturer: IBM
-    product_name: IBM System x3755 -[88774RG]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2599000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 8218
-    version: 8218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 33878695936
-  architecture:
-    smp_size: 4
-    platform_type: x86_64
-    smt_size: 8
-borderline-6:
-  bios:
-    version: ZYE133AUS-1.13
-    release_date: 08/09/2007
-    vendor: IBM
-  block_devices:
-    sda:
-      model: 8k-l Stripe
-      device: sda
-      size: 586783129600
-      rev: V1.0
-      vendor: ServeRA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:2d
-      rate: 20000000000
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.2.6
-      driver: mlx4_core
-      mountable: true
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:b6:7d
-      ip6: fe80::260:ddff:fe47:b67d
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.2.16
-      driver: mx ethernet (myri)
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:2e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:57:82:a6
-      ip6: fe80::214:5eff:fe57:82a6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.2.6
-    eth1:
-      mounted: false
-      mac: 00:14:5e:57:82:a4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.5.6
-    bmc:
-      mac: 00:14:5e:57:82:a8
-      ip: 172.17.2.6
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: 99A3256
-    manufacturer: IBM
-    product_name: IBM System x3755 -[88774RG]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2599000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 8218
-    version: 8218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 33878695936
-  architecture:
-    smp_size: 4
-    platform_type: x86_64
-    smt_size: 8
-borderline-7:
-  bios:
-    version: -[ZYE129AUS-1.08]-
-    release_date: 02/23/2007
-    vendor: IBM
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: 8k-l Stripe
-      device: sda
-      size: 586783129600
-      rev: V1.0
-      vendor: ServeRA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:3d
-      rate: 20000000000
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.2.7
-      driver: mlx4_core
-      mountable: true
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:86:96
-      ip6: fe80::260:ddff:fe47:8696
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.2.17
-      driver: mx ethernet (myri)
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:3e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:57:cc:02
-      ip6: fe80::214:5eff:fe57:cc02
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.2.7
-    eth1:
-      mounted: false
-      mac: 00:14:5e:57:cc:00
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.5.7
-    bmc:
-      mac: 00:14:5e:57:cc:04
-      ip: 172.17.2.7
-  chassis:
-    serial_number: 99A3251
-    manufacturer: IBM
-    product_name: IBM System x3755 -[88774RG]-
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 33878695936
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2599000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 8218
-    version: 8218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 4
-    platform_type: x86_64
-    smt_size: 8
-borderline-8:
-  bios:
-    version: -[ZYE129AUS-1.08]-
-    release_date: 02/23/2007
-    vendor: IBM
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:49
-      rate: 20000000000
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.2.8
-      driver: mlx4_core
-      mountable: true
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:b5:14
-      ip6: fe80::260:ddff:fe47:b514
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.2.18
-      driver: mx ethernet (myri)
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:57:cb:d8
-      ip6: fe80::214:5eff:fe57:cbd8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.2.8
-    eth1:
-      mounted: false
-      mac: 00:14:5e:57:cb:d6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.5.8
-    bmc:
-      mac: 00:14:5e:57:cb:da
-      ip: 172.17.2.8
-  block_devices:
-    sda:
-      model: 8k-l Stripe
-      device: sda
-      size: 586772643840
-      rev: V1.0
-      vendor: ServeRA
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: 99A3250
-    manufacturer: IBM
-    product_name: IBM System x3755 -[88774RG]-
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 33878695936
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2599000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 8218
-    version: 8218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 4
-    platform_type: x86_64
-    smt_size: 8
-borderline-9:
-  bios:
-    version: -[ZYE129AUS-1.08]-
-    release_date: 02/23/2007
-    vendor: IBM
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1f:85
-      rate: 20000000000
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.2.9
-      driver: mlx4_core
-      mountable: true
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:7d:8c
-      ip6: fe80::260:ddff:fe47:7d8c
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.2.19
-      driver: mx ethernet (myri)
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1f:86
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:57:cb:ae
-      ip6: fe80::214:5eff:fe57:cbae
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.2.9
-    eth1:
-      mounted: false
-      mac: 00:14:5e:57:cb:ac
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.5.9
-    bmc:
-      mac: 00:14:5e:57:cb:b0
-      ip: 172.17.2.9
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: 8k-l Stripe
-      device: sda
-      size: 586783129600
-      rev: V1.0
-      vendor: ServeRA
-  chassis:
-    serial_number: 99A3253
-    manufacturer: IBM
-    product_name: IBM System x3755 -[88774RG]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2599000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 8218
-    version: 8218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 33878695936
-  architecture:
-    smp_size: 4
-    platform_type: x86_64
-    smt_size: 8
-borderline-10:
-  bios:
-    version: -[ZYE129AUS-1.08]-
-    release_date: 02/23/2007
-    vendor: IBM
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: 8k-l Stripe
-      device: sda
-      size: 586772643840
-      rev: V1.0
-      vendor: ServeRA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:fd
-      rate: 20000000000
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.2.10
-      driver: mlx4_core
-      mountable: true
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:b7:28
-      ip6: fe80::260:ddff:fe47:b67a
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.2.20
-      driver: mx ethernet (myri)
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:fe
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:5e:57:cb:f6
-      ip6: fe80::214:5eff:fe57:cc3e
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.2.10
-    eth1:
-      mounted: false
-      mac: 00:14:5e:57:cb:f4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.5.10
-    bmc:
-      mac: 00:14:5e:57:cb:f8
-      ip: 172.17.2.10
-  chassis:
-    serial_number: 99A3258
-    manufacturer: IBM
-    product_name: IBM System x3755 -[88774RG]-
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2599000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 8218
-    version: 8218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 31760584704
-  architecture:
-    smp_size: 4
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/bordeaux/net-links/gw-bordeaux.yaml b/generators/input/sites/bordeaux/net-links/gw-bordeaux.yaml
deleted file mode 100644
index 4dcf86db30193802d5be5cfaae5b7a69a1722068..0000000000000000000000000000000000000000
--- a/generators/input/sites/bordeaux/net-links/gw-bordeaux.yaml
+++ /dev/null
@@ -1,195 +0,0 @@
----
-gw-bordeaux:
-  model: HP Procurve 5406zl J8697A
-  kind: router
-  site: bordeaux
-  snmp_community: public
-  mtu: 9220
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.16.15.254
-  routes: {}
-  backplane_bps: 346000000000
-  linecards:
-    1:
-      naming_pattern: "%LINECARD:A%%PORT%"
-      backplane_bps: 14400000000
-      model: J8707A
-      kind: switch
-      rate: 10000000000
-      ports:
-        1:
-          uid: sborderline
-          kind: switch
-        3:
-          kind: virtual
-          uid: renater-bordeaux
-        4:
-          uid: storage
-          kind: other
-          port: eth0
-    2:
-      naming_pattern: "%LINECARD:A%%PORT%"
-      backplane_bps: 14400000000
-      model: J8705A
-      kind: node
-      rate: 100000000
-      ports:
-        1: bordereau-1
-        2: bordereau-2
-        3: bordereau-3
-        4: bordereau-4
-        5: bordereau-5
-        6: bordereau-6
-        7: bordereau-7
-        8: bordereau-8
-        9: bordereau-9
-        10: bordereau-10
-        11: bordereau-11
-        12: bordereau-12
-        13: bordereau-13
-        14: bordereau-14
-        15: bordereau-15
-        16: bordereau-16
-        17: bordereau-17
-        18: bordereau-18
-        19: bordereau-19
-        20: bordereau-20
-        21: bordereau-21
-        22: bordereau-22
-        23: bordereau-23
-        24: bordereau-24
-    3:
-      naming_pattern: "%LINECARD:A%%PORT%"
-      backplane_bps: 14400000000
-      model: J8702A
-      kind: node
-      rate: 100000000
-      ports:
-        1: bordereau-25
-        2: bordereau-26
-        3: bordereau-27
-        4: bordereau-28
-        5: bordereau-29
-        6: bordereau-30
-        7: bordereau-31
-        8: bordereau-32
-        9: bordereau-33
-        10: bordereau-34
-        11: bordereau-35
-        12: bordereau-36
-        13: bordereau-37
-        14: bordereau-38
-        15: bordereau-39
-        16: bordereau-40
-        17: bordereau-41
-        18: bordereau-42
-        19: bordereau-43
-        20: bordereau-44
-        21: bordereau-45
-        22: bordereau-46
-        23: bordereau-47
-        24: bordereau-48
-    4:
-      naming_pattern: "%LINECARD:A%%PORT%"
-      backplane_bps: 14400000000
-      model: J8702A
-      kind: node
-      rate: 100000000
-      ports:
-        1: bordereau-49
-        2: bordereau-50
-        3: bordereau-51
-        4: bordereau-52
-        5: bordereau-53
-        6: bordereau-54
-        7: bordereau-55
-        8: bordereau-56
-        9: bordereau-57
-        10: bordereau-58
-        11: bordereau-59
-        12: bordereau-60
-        13: bordereau-61
-        14: bordereau-62
-        15: bordereau-63
-        16: bordereau-64
-        17: bordereau-65
-        18: bordereau-66
-        19: bordereau-67
-        20: bordereau-68
-        21: bordereau-69
-        22: bordereau-70
-        23: bordereau-71
-        24: bordereau-72
-    5:
-      naming_pattern: "%LINECARD:A%%PORT%"
-      backplane_bps: 14400000000
-      model: J8702A
-      kind: node
-      rate: 100000000
-      ports:
-        1: bordereau-73
-        2: bordereau-74
-        3: bordereau-75
-        4: bordereau-76
-        5: bordereau-77
-        6: bordereau-78
-        7: bordereau-79
-        8: bordereau-80
-        9: bordereau-81
-        10: bordereau-82
-        11: bordereau-83
-        12: bordereau-84
-        13: bordereau-85
-        14: bordereau-86
-        15: bordereau-87
-        16: bordereau-88
-        17: bordereau-89
-        18: bordereau-90
-        19: bordereau-91
-        20: bordereau-92
-        21: bordereau-93
-    6:
-      naming_pattern: "%LINECARD:A%%PORT%"
-      backplane_bps: 14400000000
-      model: J8702A
-      kind: other
-      rate: 100000000
-      ports:
-        1:
-          uid: xen-srv1
-          port: eth0
-        2:
-          uid: xen-srv1
-          port: eth1
-        3:
-          uid: xen-srv2
-          port: eth0
-        4:
-          uid: xen-srv2
-          port: eth1
-        5:
-          uid: borderline
-          port: eth0
-        6:
-          uid: borderline
-          port: eth1
-        12:
-          uid: mx-borderline
-          kind: switch
-        15:
-          uid: LaBRI
-          kind: virtual
-          rate: 1000000000
-        16:
-          uid: ib-borderline
-          kind: switch
-        17:
-          uid: st-bordemer
-          kind: switch
-
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/bordeaux/net-links/ib-borderline.yaml b/generators/input/sites/bordeaux/net-links/ib-borderline.yaml
deleted file mode 100644
index ecad5b376f82c3049d91c1e68a2936f91cb80ee0..0000000000000000000000000000000000000000
--- a/generators/input/sites/bordeaux/net-links/ib-borderline.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-ib-borderline:
-  model: Infiniband
-  kind: switch
-  site: bordeaux
-  snmp_community: public
-  weathermap:
-    use_cacti: "no"
-  vlans:
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards:
-    0:
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: router
-      rate: 10000000000
-      ports:
-        0: gw-bordeaux
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/bordeaux/net-links/mx-borderline.yaml b/generators/input/sites/bordeaux/net-links/mx-borderline.yaml
deleted file mode 100644
index 3d4052e4e1be7ec72f17140914611c357d30f66a..0000000000000000000000000000000000000000
--- a/generators/input/sites/bordeaux/net-links/mx-borderline.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-mx-borderline:
-  model: Myrinet
-  kind: switch
-  site: bordeaux
-  snmp_community: public
-  weathermap:
-    use_cacti: "no"
-  vlans:
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards:
-    0:
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: router
-      rate: 10000000000
-      ports:
-        0: gw-bordeaux
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/bordeaux/net-links/sbordeplage1.yaml b/generators/input/sites/bordeaux/net-links/sbordeplage1.yaml
deleted file mode 100644
index f324166b7212883ad6c9e845847b94837fa317d2..0000000000000000000000000000000000000000
--- a/generators/input/sites/bordeaux/net-links/sbordeplage1.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-sbordeplage1:
-  model: PowerConnect 5324
-  kind: switch
-  site: bordeaux
-  snmp_community: public
-  weathermap:
-    use_cacti: "no"
-  mtu: 8192
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.15.201
-  routes: {}
-  linecards:
-    0:
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: switch
-      rate: 1000000000
-      ports:
-        0: st-bordemer
-        1: dinkum-thinkum
-    1:
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports:
-        1: bordeplage-1
-        2: bordeplage-2
-        3: bordeplage-3
-        4: bordeplage-4
-        5: bordeplage-5
-        6: bordeplage-6
-        7: bordeplage-7
-        8: bordeplage-8
-        9: bordeplage-9
-        10: bordeplage-10
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/bordeaux/net-links/sbordeplage2.yaml b/generators/input/sites/bordeaux/net-links/sbordeplage2.yaml
deleted file mode 100644
index 90f9af19f3ef33f7347239380975f54a5a63cefb..0000000000000000000000000000000000000000
--- a/generators/input/sites/bordeaux/net-links/sbordeplage2.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-sbordeplage2:
-  model: PowerConnect 3424
-  kind: switch
-  site: bordeaux
-  snmp_community: public
-  weathermap:
-    use_cacti: "no"
-  mtu: 9216
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.15.202
-  routes: {}
-
-  linecards:
-    0:
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: switch
-      rate: 1000000000
-      ports:
-        0: st-bordemer
-    1:
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports:
-        1: bordeplage-11
-        2: bordeplage-12
-        3: bordeplage-13
-        4: bordeplage-14
-        5: bordeplage-15
-        6: bordeplage-16
-        7: bordeplage-17
-        8: bordeplage-18
-        9: bordeplage-19
-        10: bordeplage-20
-        11: bordeplage-21
-        12: bordeplage-22
-        13: bordeplage-23
-        14: bordeplage-24
-        15: bordeplage-25
-        16: bordeplage-26
-        17: bordeplage-27
-        18: bordeplage-28
-        19: bordeplage-29
-        20: bordeplage-30
-        21: bordeplage-31
-        22: bordeplage-32
-        23: bordeplage-33
-        24: bordeplage-34
-        25: bordeplage-35
-        26: bordeplage-36
-        27: bordeplage-37
-        28: bordeplage-38
-        29: bordeplage-39
-        30: bordeplage-40
-        31: bordeplage-41
-        32: bordeplage-42
-        33: bordeplage-43
-        34: bordeplage-44
-        35: bordeplage-45
-        36: bordeplage-46
-        37: bordeplage-47
-        38: bordeplage-48
-        39: bordeplage-49
-        40: bordeplage-50
-        41: bordeplage-51
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/bordeaux/net-links/sborderline.yaml b/generators/input/sites/bordeaux/net-links/sborderline.yaml
deleted file mode 100644
index d0bcd104905f8def9ae5e304007ae1853fd9fc8c..0000000000000000000000000000000000000000
--- a/generators/input/sites/bordeaux/net-links/sborderline.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-sborderline:
-  model: Nortel 5530
-  kind: switch
-  site: bordeaux
-  snmp_community: public
-  weathermap:
-    use_cacti: "no"
-  mtu: 9600
-  vlans:
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards:
-    0:
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: router
-      rate: 10000000000
-      ports:
-        0: gw-bordeaux
-    1:
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports:
-        1: borderline-1
-        2: borderline-2
-        3: borderline-3
-        4: borderline-4
-        5: borderline-5
-        6: borderline-6
-        7: borderline-7
-        8: borderline-8
-        9: borderline-9
-        10: borderline-10
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/bordeaux/net-links/st-bordemer.yaml b/generators/input/sites/bordeaux/net-links/st-bordemer.yaml
deleted file mode 100644
index 84e44487f4956fd9408f61ba133d1b19f51a0044..0000000000000000000000000000000000000000
--- a/generators/input/sites/bordeaux/net-links/st-bordemer.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-st-bordemer:
-  model: Cisco WS-C3750G-24TS
-  kind: switch
-  site: bordeaux
-  snmp_community: public
-  mtu: 9000
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.15.200
-  routes: {}
-
-  linecards:
-    1:
-      naming_pattern: "Gi%LINECARD%/0/%PORT%"
-      kind: router
-      rate: 1000000000
-      ports:
-        25: gw-bordeaux
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/bordeaux/pdus.rb b/generators/input/sites/bordeaux/pdus.rb
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/generators/lib/g5k_generator.rb b/generators/lib/g5k_generator.rb
index 4c800ddebf946f538ec84b812bf79d040c751a25..603440628f5abc052fb35c0ca582fae72aabdbca 100755
--- a/generators/lib/g5k_generator.rb
+++ b/generators/lib/g5k_generator.rb
@@ -138,7 +138,7 @@ module G5K
     
     # This method is used exclusivly for environments. Example:
     # environment 'squeeze-x64-xen-0.8' do
-    #  available_on %w{bordeaux grenoble lille lyon nancy orsay rennes sophia toulouse}
+    #  available_on %w{grenoble lille lyon nancy rennes sophia toulouse}
     # end    
     def available_on(sites_uid)
       env_uid = @context[:uid]